diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-10-29 02:19:05 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-10-29 02:19:05 +0000 |
| commit | 672edbbcc089f143eee2bdeb3088858e2f5c7034 (patch) | |
| tree | 4ed9ec0fb95d358bb0c60755b14b140a1159ab18 /target/linux/generic/patches-3.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch | |
| parent | 58abdeaa982a1531e10556028cdbe78123c595c6 (diff) | |
| download | upstream-672edbbcc089f143eee2bdeb3088858e2f5c7034.tar.gz upstream-672edbbcc089f143eee2bdeb3088858e2f5c7034.tar.bz2 upstream-672edbbcc089f143eee2bdeb3088858e2f5c7034.zip | |
kernel: refresh 3.12 patches on -rc7 release
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38572 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch')
| -rw-r--r-- | target/linux/generic/patches-3.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/generic/patches-3.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/patches-3.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch index 5d52040690..64b2b37188 100644 --- a/target/linux/generic/patches-3.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ b/target/linux/generic/patches-3.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch @@ -127,7 +127,7 @@ static const struct rt6_info ip6_blk_hole_entry_template = { .dst = { .__refcnt = ATOMIC_INIT(1), -@@ -1553,6 +1571,9 @@ int ip6_route_add(struct fib6_config *cf +@@ -1577,6 +1595,9 @@ int ip6_route_add(struct fib6_config *cf case RTN_THROW: rt->dst.error = -EAGAIN; break; @@ -137,7 +137,7 @@ default: rt->dst.error = -ENETUNREACH; break; -@@ -2129,6 +2150,17 @@ static int ip6_pkt_prohibit_out(struct s +@@ -2156,6 +2177,17 @@ static int ip6_pkt_prohibit_out(struct s return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES); } @@ -155,7 +155,7 @@ #endif /* -@@ -2334,7 +2366,8 @@ static int rtm_to_fib6_config(struct sk_ +@@ -2362,7 +2394,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 || @@ -165,7 +165,7 @@ cfg->fc_flags |= RTF_REJECT; if (rtm->rtm_type == RTN_LOCAL) -@@ -2536,6 +2569,9 @@ static int rt6_fill_node(struct net *net +@@ -2564,6 +2597,9 @@ static int rt6_fill_node(struct net *net case -EACCES: rtm->rtm_type = RTN_PROHIBIT; break; @@ -175,7 +175,7 @@ case -EAGAIN: rtm->rtm_type = RTN_THROW; break; -@@ -2786,6 +2822,8 @@ static int ip6_route_dev_notify(struct n +@@ -2814,6 +2850,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); @@ -184,7 +184,7 @@ net->ipv6.ip6_blk_hole_entry->dst.dev = dev; net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); #endif -@@ -3046,6 +3084,17 @@ static int __net_init ip6_route_net_init +@@ -3074,6 +3112,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); @@ -202,7 +202,7 @@ #endif net->ipv6.sysctl.flush_delay = 0; -@@ -3064,6 +3113,8 @@ out: +@@ -3092,6 +3141,8 @@ out: return ret; #ifdef CONFIG_IPV6_MULTIPLE_TABLES @@ -211,7 +211,7 @@ out_ip6_prohibit_entry: kfree(net->ipv6.ip6_prohibit_entry); out_ip6_null_entry: -@@ -3081,6 +3132,7 @@ static void __net_exit ip6_route_net_exi +@@ -3109,6 +3160,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); @@ -219,7 +219,7 @@ #endif dst_entries_destroy(&net->ipv6.ip6_dst_ops); } -@@ -3177,6 +3229,9 @@ int __init ip6_route_init(void) +@@ -3205,6 +3257,9 @@ int __init ip6_route_init(void) 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); |