diff options
Diffstat (limited to 'packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch')
| -rw-r--r-- | packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch | 38 |
1 files changed, 19 insertions, 19 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 5efe2b92..9c79e4f5 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 @@ -18,10 +18,10 @@ 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 e7b3fa7bb3f7..081b344ea52b 100644 +index a66054d0763a..53440098fa98 100644 --- a/Documentation/networking/ip-sysctl.rst +++ b/Documentation/networking/ip-sysctl.rst -@@ -1592,6 +1592,17 @@ src_valid_mark - BOOLEAN +@@ -1734,6 +1734,17 @@ src_valid_mark - BOOLEAN Default value is 0. @@ -52,10 +52,10 @@ index ddb27fc0ee8c..8ee3191d9558 100644 struct in_ifaddr { struct hlist_node hash; diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h -index 37dfdcfcdd54..d549006be04c 100644 +index af8a771a053c..ece8ac89d317 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h -@@ -83,6 +83,7 @@ struct ipv6_devconf { +@@ -84,6 +84,7 @@ struct ipv6_devconf { __u8 ndisc_evict_nocarrier; struct ctl_table_header *sysctl_header; @@ -64,10 +64,10 @@ index 37dfdcfcdd54..d549006be04c 100644 struct ipv6_params { diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h -index 874a92349bf5..37a9c7c7b56c 100644 +index 283dec7e3645..8067941a635e 100644 --- a/include/uapi/linux/ip.h +++ b/include/uapi/linux/ip.h -@@ -172,6 +172,7 @@ enum +@@ -173,6 +173,7 @@ enum IPV4_DEVCONF_DROP_GRATUITOUS_ARP, IPV4_DEVCONF_BC_FORWARDING, IPV4_DEVCONF_ARP_EVICT_NOCARRIER, @@ -76,22 +76,22 @@ index 874a92349bf5..37a9c7c7b56c 100644 }; diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h -index 81f4243bebb1..9e001ea84841 100644 +index cf592d7b630f..e8915701aa73 100644 --- a/include/uapi/linux/ipv6.h +++ b/include/uapi/linux/ipv6.h -@@ -197,6 +197,7 @@ enum { - DEVCONF_IOAM6_ID_WIDE, +@@ -199,6 +199,7 @@ enum { DEVCONF_NDISC_EVICT_NOCARRIER, DEVCONF_ACCEPT_UNTRACKED_NA, + DEVCONF_ACCEPT_RA_MIN_LFT, + DEVCONF_LINK_FILTER, DEVCONF_MAX }; diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c -index e8b9a9202fec..1bb48732e619 100644 +index ca0ff15dc8fa..67a55fec5b29 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c -@@ -2561,6 +2561,7 @@ static struct devinet_sysctl_table { +@@ -2582,6 +2582,7 @@ static struct devinet_sysctl_table { "route_localnet"), DEVINET_SYSCTL_FLUSHING_ENTRY(DROP_UNICAST_IN_L2_MULTICAST, "drop_unicast_in_l2_multicast"), @@ -100,18 +100,18 @@ index e8b9a9202fec..1bb48732e619 100644 }; diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c -index 9c3f5202a97b..fbc072c3534e 100644 +index b007d098ffe2..865d7be4fd29 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c -@@ -5591,6 +5591,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, - array[DEVCONF_IOAM6_ID_WIDE] = cnf->ioam6_id_wide; +@@ -5639,6 +5639,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, array[DEVCONF_NDISC_EVICT_NOCARRIER] = cnf->ndisc_evict_nocarrier; array[DEVCONF_ACCEPT_UNTRACKED_NA] = cnf->accept_untracked_na; + array[DEVCONF_ACCEPT_RA_MIN_LFT] = cnf->accept_ra_min_lft; + array[DEVCONF_LINK_FILTER] = cnf->link_filter; } static inline size_t inet6_ifla6_size(void) -@@ -7016,6 +7017,13 @@ static const struct ctl_table addrconf_sysctl[] = { +@@ -7067,6 +7068,13 @@ static const struct ctl_table addrconf_sysctl[] = { .extra1 = (void *)SYSCTL_ZERO, .extra2 = (void *)SYSCTL_ONE, }, @@ -126,10 +126,10 @@ index 9c3f5202a97b..fbc072c3534e 100644 .procname = "ioam6_id", .data = &ipv6_devconf.ioam6_id, diff --git a/net/ipv6/route.c b/net/ipv6/route.c -index 2f355f0ec32a..388e0342c989 100644 +index 56525b5b95a2..e3af0e704291 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c -@@ -675,6 +675,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh) +@@ -676,6 +676,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh) } #endif @@ -144,7 +144,7 @@ index 2f355f0ec32a..388e0342c989 100644 /* * Default Router Selection (RFC 2461 6.3.6) */ -@@ -716,6 +724,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif, +@@ -717,6 +725,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; @@ -154,5 +154,5 @@ index 2f355f0ec32a..388e0342c989 100644 m |= IPV6_DECODE_PREF(IPV6_EXTRACT_PREF(fib6_flags)) << 2; #endif -- -2.30.2 +2.39.2 |