diff options
| author | Etienne Haarsma <bladeoner112@gmail.com> | 2018-05-05 18:50:42 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-05-07 07:58:33 +0200 |
| commit | e8b1af45f8b2883e76f5d491c2fda2fca20c5634 (patch) | |
| tree | d681b02c5305d30e79f0af0f986e6407e9d39c69 /target/linux/generic/patches-4.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch | |
| parent | 999bb66b20b03c753801ecebf1ec2a03c6a63c96 (diff) | |
| download | upstream-e8b1af45f8b2883e76f5d491c2fda2fca20c5634.tar.gz upstream-e8b1af45f8b2883e76f5d491c2fda2fca20c5634.tar.bz2 upstream-e8b1af45f8b2883e76f5d491c2fda2fca20c5634.zip | |
kernel: bump kernel 4.4 to 4.4.131 for 17.01
* Refreshed patches
Compile-tested: ar71xx
Run-tested: ar71xx
Signed-off-by: Etienne Haarsma <bladeoner112@gmail.com>
Diffstat (limited to 'target/linux/generic/patches-4.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch')
| -rw-r--r-- | target/linux/generic/patches-4.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/patches-4.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/patches-4.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch index 570e587fe7..76e235a8fa 100644 --- a/target/linux/generic/patches-4.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ b/target/linux/generic/patches-4.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch @@ -173,7 +173,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> /* * Allocate a dst for local (unicast / anycast) address. */ -@@ -2747,7 +2780,8 @@ static int rtm_to_fib6_config(struct sk_ +@@ -2749,7 +2782,8 @@ static int rtm_to_fib6_config(struct sk_ if (rtm->rtm_type == RTN_UNREACHABLE || rtm->rtm_type == RTN_BLACKHOLE || rtm->rtm_type == RTN_PROHIBIT || @@ -183,7 +183,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> cfg->fc_flags |= RTF_REJECT; if (rtm->rtm_type == RTN_LOCAL) -@@ -3100,6 +3134,9 @@ static int rt6_fill_node(struct net *net +@@ -3102,6 +3136,9 @@ static int rt6_fill_node(struct net *net case -EACCES: rtm->rtm_type = RTN_PROHIBIT; break; @@ -193,7 +193,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> case -EAGAIN: rtm->rtm_type = RTN_THROW; break; -@@ -3379,6 +3416,8 @@ static int ip6_route_dev_notify(struct n +@@ -3381,6 +3418,8 @@ static int ip6_route_dev_notify(struct n #ifdef CONFIG_IPV6_MULTIPLE_TABLES net->ipv6.ip6_prohibit_entry->dst.dev = dev; net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); @@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> net->ipv6.ip6_blk_hole_entry->dst.dev = dev; net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); #endif -@@ -3390,6 +3429,7 @@ static int ip6_route_dev_notify(struct n +@@ -3392,6 +3431,7 @@ static int ip6_route_dev_notify(struct n in6_dev_put(net->ipv6.ip6_null_entry->rt6i_idev); #ifdef CONFIG_IPV6_MULTIPLE_TABLES in6_dev_put(net->ipv6.ip6_prohibit_entry->rt6i_idev); @@ -210,7 +210,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> in6_dev_put(net->ipv6.ip6_blk_hole_entry->rt6i_idev); #endif } -@@ -3605,6 +3645,17 @@ static int __net_init ip6_route_net_init +@@ -3607,6 +3647,17 @@ static int __net_init ip6_route_net_init net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, ip6_template_metrics, true); @@ -228,7 +228,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> #endif net->ipv6.sysctl.flush_delay = 0; -@@ -3623,6 +3674,8 @@ out: +@@ -3625,6 +3676,8 @@ out: return ret; #ifdef CONFIG_IPV6_MULTIPLE_TABLES @@ -237,7 +237,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> out_ip6_prohibit_entry: kfree(net->ipv6.ip6_prohibit_entry); out_ip6_null_entry: -@@ -3640,6 +3693,7 @@ static void __net_exit ip6_route_net_exi +@@ -3642,6 +3695,7 @@ static void __net_exit ip6_route_net_exi #ifdef CONFIG_IPV6_MULTIPLE_TABLES kfree(net->ipv6.ip6_prohibit_entry); kfree(net->ipv6.ip6_blk_hole_entry); @@ -245,7 +245,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> #endif dst_entries_destroy(&net->ipv6.ip6_dst_ops); } -@@ -3713,6 +3767,9 @@ void __init ip6_route_init_special_entri +@@ -3715,6 +3769,9 @@ void __init ip6_route_init_special_entri init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); |