diff options
4 files changed, 26 insertions, 26 deletions
diff --git a/data/defaults.json b/data/defaults.json index 7697f31d..775d15e5 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "buster", "vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus", "vyos_branch": "equuleus", - "kernel_version": "5.4.255", + "kernel_version": "5.4.261", "kernel_flavor": "amd64-vyos", "release_train": "equuleus", "additional_repositories": [ diff --git a/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch b/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch index 2be1a3c8..fb94c163 100644 --- a/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch +++ b/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch @@ -19,7 +19,7 @@ Backport of earlier Vyatta patch. 8 files changed, 39 insertions(+) diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt -index 8af3771a3ebf..93408cc52991 100644 +index 5cf601c94e35..12457ee20f22 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -1245,6 +1245,19 @@ rp_filter - INTEGER @@ -43,7 +43,7 @@ index 8af3771a3ebf..93408cc52991 100644 1 - Allows you to have multiple network interfaces on the same subnet, and have the ARPs for each interface be answered diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h -index 3515ca64e638..dcae58193580 100644 +index b68fca08be27..9cdfccdbb9fb 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/inetdevice.h @@ -133,6 +133,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev) @@ -55,7 +55,7 @@ index 3515ca64e638..dcae58193580 100644 struct in_ifaddr { struct hlist_node hash; diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h -index ea7c7906591e..57f656ea2783 100644 +index d5c507311efb..066ad20f2b39 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -76,6 +76,7 @@ struct ipv6_devconf { @@ -91,7 +91,7 @@ index 9c0f4a92bcff..619edd130cfd 100644 }; diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c -index a27d034c85cc..b62b62abe907 100644 +index 4c013f8800f0..409050b2bc44 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -2550,6 +2550,8 @@ static struct devinet_sysctl_table { @@ -104,10 +104,10 @@ index a27d034c85cc..b62b62abe907 100644 }; diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c -index 635b2482fa20..ce1405ecf6f6 100644 +index c523236d934e..1bd2b92a017f 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c -@@ -5477,6 +5477,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, +@@ -5507,6 +5507,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, array[DEVCONF_ADDR_GEN_MODE] = cnf->addr_gen_mode; array[DEVCONF_DISABLE_POLICY] = cnf->disable_policy; array[DEVCONF_NDISC_TCLASS] = cnf->ndisc_tclass; @@ -115,7 +115,7 @@ index 635b2482fa20..ce1405ecf6f6 100644 } static inline size_t inet6_ifla6_size(void) -@@ -6849,6 +6850,14 @@ static const struct ctl_table addrconf_sysctl[] = { +@@ -6879,6 +6880,14 @@ static const struct ctl_table addrconf_sysctl[] = { .mode = 0644, .proc_handler = addrconf_sysctl_disable_policy, }, @@ -131,10 +131,10 @@ index 635b2482fa20..ce1405ecf6f6 100644 .procname = "ndisc_tclass", .data = &ipv6_devconf.ndisc_tclass, diff --git a/net/ipv6/route.c b/net/ipv6/route.c -index 46df6345bb99..2b930a2c4fdb 100644 +index 209d52ebbd19..edf7b5e9466a 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c -@@ -686,6 +686,15 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh) +@@ -687,6 +687,15 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh) } #endif @@ -150,7 +150,7 @@ index 46df6345bb99..2b930a2c4fdb 100644 /* * Default Router Selection (RFC 2461 6.3.6) */ -@@ -727,6 +736,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif, +@@ -728,6 +737,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif, if (!m && (strict & RT6_LOOKUP_F_IFACE)) return RT6_NUD_FAIL_HARD; @@ -160,5 +160,5 @@ index 46df6345bb99..2b930a2c4fdb 100644 m |= IPV6_DECODE_PREF(IPV6_EXTRACT_PREF(fib6_flags)) << 2; #endif -- -2.20.1 +2.39.2 diff --git a/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch b/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch index 21f4cd60..8f4b003d 100644 --- a/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch +++ b/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch @@ -44,7 +44,7 @@ index 6736e47d94d8..84d9b31300c0 100644 + + If unsure, say N. diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c -index 81ffc8629fc4..cacedffa6534 100644 +index b949b2c02f4b..5bbb53db64a4 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c @@ -15,6 +15,7 @@ @@ -186,7 +186,7 @@ index 81ffc8629fc4..cacedffa6534 100644 struct inotify_inode_mark *i_mark) { diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c -index d6b724beb304..380ac598f2e4 100644 +index f5cf0938f298..c3bb42c9d291 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -15,6 +15,7 @@ @@ -197,7 +197,7 @@ index d6b724beb304..380ac598f2e4 100644 #include "overlayfs.h" MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>"); -@@ -1758,6 +1759,18 @@ static void ovl_inode_init_once(void *foo) +@@ -1767,6 +1768,18 @@ static void ovl_inode_init_once(void *foo) inode_init_once(&oi->vfs_inode); } @@ -216,7 +216,7 @@ index d6b724beb304..380ac598f2e4 100644 static int __init ovl_init(void) { int err; -@@ -1772,13 +1785,21 @@ static int __init ovl_init(void) +@@ -1781,13 +1794,21 @@ static int __init ovl_init(void) err = register_filesystem(&ovl_fs_type); if (err) @@ -239,7 +239,7 @@ index d6b724beb304..380ac598f2e4 100644 unregister_filesystem(&ovl_fs_type); /* -@@ -1787,7 +1808,6 @@ static void __exit ovl_exit(void) +@@ -1796,7 +1817,6 @@ static void __exit ovl_exit(void) */ rcu_barrier(); kmem_cache_destroy(ovl_inode_cachep); @@ -292,5 +292,5 @@ index 6a24905f6e1e..4484f0760588 100644 + #endif /* _LINUX_INOTIFY_H */ -- -2.20.1 +2.39.2 diff --git a/packages/linux-kernel/patches/kernel/0004-revert-net-sched-retire-tcindex-classifier.patch b/packages/linux-kernel/patches/kernel/0004-revert-net-sched-retire-tcindex-classifier.patch index bc57bee9..2eb806a7 100644 --- a/packages/linux-kernel/patches/kernel/0004-revert-net-sched-retire-tcindex-classifier.patch +++ b/packages/linux-kernel/patches/kernel/0004-revert-net-sched-retire-tcindex-classifier.patch @@ -1,6 +1,6 @@ -From 4bdc6cb93ef35b1d1ff394e7d74ae9c0f366fbfd Mon Sep 17 00:00:00 2001 +From 58559e68b5a93bebf630c5ac99981ec054612583 Mon Sep 17 00:00:00 2001 From: Christian Breunig <christian@breunig.cc> -Date: Thu, 18 May 2023 20:53:54 +0000 +Date: Fri, 24 Nov 2023 09:28:56 +0100 Subject: [PATCH] Revert "net/sched: Retire tcindex classifier" This reverts commit 7a6fb69bbcb21e9ce13bdf18c008c268874f0480. @@ -12,7 +12,7 @@ This reverts commit 7a6fb69bbcb21e9ce13bdf18c008c268874f0480. create mode 100644 net/sched/cls_tcindex.c diff --git a/net/sched/Kconfig b/net/sched/Kconfig -index 2e4604cdaf23..2985509147a2 100644 +index 46f2847a071e..131e653e9945 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -469,6 +469,17 @@ config NET_CLS_BASIC @@ -34,17 +34,17 @@ index 2e4604cdaf23..2985509147a2 100644 tristate "Routing decision (ROUTE)" depends on INET diff --git a/net/sched/Makefile b/net/sched/Makefile -index 9e1f904d0c18..415d1e1f237e 100644 +index fb2b90648a20..b2dcc40d92da 100644 --- a/net/sched/Makefile +++ b/net/sched/Makefile -@@ -66,6 +66,7 @@ obj-$(CONFIG_NET_CLS_U32) += cls_u32.o +@@ -65,6 +65,7 @@ obj-$(CONFIG_NET_SCH_TAPRIO) += sch_taprio.o + obj-$(CONFIG_NET_CLS_U32) += cls_u32.o obj-$(CONFIG_NET_CLS_ROUTE4) += cls_route.o obj-$(CONFIG_NET_CLS_FW) += cls_fw.o - obj-$(CONFIG_NET_CLS_RSVP) += cls_rsvp.o +obj-$(CONFIG_NET_CLS_TCINDEX) += cls_tcindex.o - obj-$(CONFIG_NET_CLS_RSVP6) += cls_rsvp6.o obj-$(CONFIG_NET_CLS_BASIC) += cls_basic.o obj-$(CONFIG_NET_CLS_FLOW) += cls_flow.o + obj-$(CONFIG_NET_CLS_CGROUP) += cls_cgroup.o diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c new file mode 100644 index 000000000000..768cf7cf65b4 @@ -782,5 +782,5 @@ index 000000000000..768cf7cf65b4 +module_exit(exit_tcindex) +MODULE_LICENSE("GPL"); -- -2.30.2 +2.39.2 |