diff options
Diffstat (limited to 'packages/linux-kernel/patches/kernel')
| -rw-r--r-- | packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch | 55 | ||||
| -rw-r--r-- | packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch | 17 |
2 files changed, 35 insertions, 37 deletions
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 b28f255e..c56ec40e 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 @@ -6,7 +6,6 @@ Subject: [PATCH] VyOS: Add linkstate IP device attribute Backport of earlier Vyatta patch. (cherry picked from commit 7c5a851086686be14ae937c80d6cee34814dbefc) - --- Documentation/networking/ip-sysctl.rst | 11 +++++++++++ include/linux/inetdevice.h | 1 + @@ -19,12 +18,12 @@ Backport of earlier Vyatta patch. 8 files changed, 34 insertions(+) diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst -index 25e6673a085a..4cd1134d3aac 100644 +index ba0e8e6337c0..845599a58e0c 100644 --- a/Documentation/networking/ip-sysctl.rst +++ b/Documentation/networking/ip-sysctl.rst -@@ -1425,6 +1425,17 @@ rp_filter - INTEGER - Default value is 0. Note that some distributions enable it - in startup scripts. +@@ -1526,6 +1526,17 @@ src_valid_mark - BOOLEAN + + Default value is 0. +link_filter - INTEGER + 0 - Allow packets to be received for the address on this interface @@ -41,7 +40,7 @@ index 25e6673a085a..4cd1134d3aac 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..bfb49b5913e7 100644 +index a038feb63f23..8720f70360a7 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) @@ -53,11 +52,11 @@ index 3515ca64e638..bfb49b5913e7 100644 struct in_ifaddr { struct hlist_node hash; diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h -index dda61d150a13..9d96b27ec350 100644 +index d1f386430795..6f24c8827d88 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h -@@ -77,6 +77,7 @@ struct ipv6_devconf { - __s32 rpl_seg_enabled; +@@ -81,6 +81,7 @@ struct ipv6_devconf { + __u8 ioam6_enabled; struct ctl_table_header *sysctl_header; + __s32 link_filter; @@ -77,22 +76,22 @@ index e42d13b55cf3..8f5291976f04 100644 }; diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h -index 13e8751bf24a..2ea26a70bda2 100644 +index b243a53fa985..9a3e0c89d17c 100644 --- a/include/uapi/linux/ipv6.h +++ b/include/uapi/linux/ipv6.h -@@ -189,6 +189,7 @@ enum { - DEVCONF_ACCEPT_RA_RT_INFO_MIN_PLEN, - DEVCONF_NDISC_TCLASS, - DEVCONF_RPL_SEG_ENABLED, +@@ -193,6 +193,7 @@ enum { + DEVCONF_IOAM6_ENABLED, + DEVCONF_IOAM6_ID, + DEVCONF_IOAM6_ID_WIDE, + DEVCONF_LINK_FILTER, DEVCONF_MAX }; diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c -index 123a6d39438f..1deb400805b0 100644 +index 4744c7839de5..4470bd7a9380 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c -@@ -2547,6 +2547,7 @@ static struct devinet_sysctl_table { +@@ -2552,6 +2552,7 @@ static struct devinet_sysctl_table { "route_localnet"), DEVINET_SYSCTL_FLUSHING_ENTRY(DROP_UNICAST_IN_L2_MULTICAST, "drop_unicast_in_l2_multicast"), @@ -101,20 +100,20 @@ index 123a6d39438f..1deb400805b0 100644 }; diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c -index 8b6eb384bac7..176a914acfee 100644 +index 6dcf034835ec..c1820333fd55 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c -@@ -5516,6 +5516,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, - array[DEVCONF_DISABLE_POLICY] = cnf->disable_policy; - array[DEVCONF_NDISC_TCLASS] = cnf->ndisc_tclass; - array[DEVCONF_RPL_SEG_ENABLED] = cnf->rpl_seg_enabled; +@@ -5579,6 +5579,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, + array[DEVCONF_IOAM6_ENABLED] = cnf->ioam6_enabled; + array[DEVCONF_IOAM6_ID] = cnf->ioam6_id; + array[DEVCONF_IOAM6_ID_WIDE] = cnf->ioam6_id_wide; + array[DEVCONF_LINK_FILTER] = cnf->link_filter; } static inline size_t inet6_ifla6_size(void) -@@ -6896,6 +6897,13 @@ static const struct ctl_table addrconf_sysctl[] = { +@@ -7020,6 +7021,13 @@ static const struct ctl_table addrconf_sysctl[] = { .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_douintvec, }, + { + .procname = "link_filter", @@ -122,15 +121,15 @@ index 8b6eb384bac7..176a914acfee 100644 + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, -+ }, ++ }, { /* sentinel */ } diff --git a/net/ipv6/route.c b/net/ipv6/route.c -index 7e0ce7af8234..c4ef9f4d40e1 100644 +index 27274fc3619a..56e546ab8453 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c -@@ -687,6 +687,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh) +@@ -672,6 +672,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh) } #endif @@ -145,7 +144,7 @@ index 7e0ce7af8234..c4ef9f4d40e1 100644 /* * Default Router Selection (RFC 2461 6.3.6) */ -@@ -728,6 +736,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif, +@@ -713,6 +721,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; @@ -155,5 +154,5 @@ index 7e0ce7af8234..c4ef9f4d40e1 100644 m |= IPV6_DECODE_PREF(IPV6_EXTRACT_PREF(fib6_flags)) << 2; #endif -- -2.20.1 +2.30.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 93e9154e..d020a473 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 @@ -19,7 +19,6 @@ for bug #303, and will allow that commit to be reverted. Bug #425 http://bugzilla.vyos.net/show_bug.cgi?id=425 (cherry picked from commit a93f1128bc83b5a6628da242e71c18ef05e81ea2) - --- fs/notify/inotify/Kconfig | 9 +++ fs/notify/inotify/inotify_user.c | 114 ++++++++++++++++++++++++++++++- @@ -45,7 +44,7 @@ index 1cc8be25df7e..bc4acd1a6ea4 100644 + + If unsure, say N. diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c -index 186722ba3894..1ce328e506c8 100644 +index 9fb7701d2f8a..a605abbf04ce 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c @@ -15,6 +15,7 @@ @@ -56,7 +55,7 @@ index 186722ba3894..1ce328e506c8 100644 #include <linux/fsnotify_backend.h> #include <linux/idr.h> #include <linux/init.h> /* fs_initcall */ -@@ -75,6 +76,93 @@ struct ctl_table inotify_table[] = { +@@ -89,6 +90,93 @@ struct ctl_table inotify_table[] = { }; #endif /* CONFIG_SYSCTL */ @@ -150,7 +149,7 @@ index 186722ba3894..1ce328e506c8 100644 static inline __u32 inotify_arg_to_mask(struct inode *inode, u32 arg) { __u32 mask; -@@ -334,8 +422,8 @@ static const struct file_operations inotify_fops = { +@@ -347,8 +435,8 @@ static const struct file_operations inotify_fops = { /* * find_inode - resolve a user-given path to a specific inode */ @@ -161,7 +160,7 @@ index 186722ba3894..1ce328e506c8 100644 { int error; -@@ -356,6 +444,28 @@ static int inotify_find_inode(const char __user *dirname, struct path *path, +@@ -369,6 +457,28 @@ static int inotify_find_inode(const char __user *dirname, struct path *path, return error; } @@ -191,7 +190,7 @@ index 186722ba3894..1ce328e506c8 100644 struct inotify_inode_mark *i_mark) { diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c -index 290983bcfbb3..c751b0c8d9e5 100644 +index 7bb0a47cb615..6dd5f1000151 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -15,6 +15,7 @@ @@ -202,7 +201,7 @@ index 290983bcfbb3..c751b0c8d9e5 100644 #include "overlayfs.h" MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>"); -@@ -2040,6 +2041,18 @@ static void ovl_inode_init_once(void *foo) +@@ -2178,6 +2179,18 @@ static void ovl_inode_init_once(void *foo) inode_init_once(&oi->vfs_inode); } @@ -221,7 +220,7 @@ index 290983bcfbb3..c751b0c8d9e5 100644 static int __init ovl_init(void) { int err; -@@ -2055,18 +2068,24 @@ static int __init ovl_init(void) +@@ -2193,18 +2206,24 @@ static int __init ovl_init(void) err = ovl_aio_request_cache_init(); if (!err) { err = register_filesystem(&ovl_fs_type); @@ -295,5 +294,5 @@ index 6a24905f6e1e..4484f0760588 100644 + #endif /* _LINUX_INOTIFY_H */ -- -2.20.1 +2.30.2 |