diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-05-05 11:43:34 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-05-05 11:43:34 +0000 |
commit | 2e3f8c480e4e27cb843553820aff019cf7cb2649 (patch) | |
tree | 84982919b31a0221ba9a0d5a4f0f732f399262d9 /target/linux/generic/patches-2.6.32/300-ipv6_accept_ra_when_forwarding.patch | |
parent | e005aed2231ce7bce0214061ea0d7f546c7fec24 (diff) | |
download | upstream-2e3f8c480e4e27cb843553820aff019cf7cb2649.tar.gz upstream-2e3f8c480e4e27cb843553820aff019cf7cb2649.tar.bz2 upstream-2e3f8c480e4e27cb843553820aff019cf7cb2649.zip |
linux/2.6.32: R.I.P.
SVN-Revision: 31597
Diffstat (limited to 'target/linux/generic/patches-2.6.32/300-ipv6_accept_ra_when_forwarding.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.32/300-ipv6_accept_ra_when_forwarding.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/target/linux/generic/patches-2.6.32/300-ipv6_accept_ra_when_forwarding.patch b/target/linux/generic/patches-2.6.32/300-ipv6_accept_ra_when_forwarding.patch deleted file mode 100644 index e9c95cf9dc..0000000000 --- a/target/linux/generic/patches-2.6.32/300-ipv6_accept_ra_when_forwarding.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/net/ipv6/ndisc.c -+++ b/net/ipv6/ndisc.c -@@ -1105,6 +1105,18 @@ errout: - rtnl_set_sk_err(net, RTNLGRP_ND_USEROPT, err); - } - -+static inline int accept_ra(struct inet6_dev *in6_dev) -+{ -+ /* -+ * If forwarding is enabled, RA are not accepted unless the special -+ * hybrid mode (accept_ra=2) is enabled. -+ */ -+ if (in6_dev->cnf.forwarding && in6_dev->cnf.accept_ra < 2) -+ return 0; -+ -+ return in6_dev->cnf.accept_ra; -+} -+ - static void ndisc_router_discovery(struct sk_buff *skb) - { - struct ra_msg *ra_msg = (struct ra_msg *)skb_transport_header(skb); -@@ -1158,8 +1170,7 @@ static void ndisc_router_discovery(struc - return; - } - -- /* skip route and link configuration on routers */ -- if (in6_dev->cnf.forwarding || !in6_dev->cnf.accept_ra) -+ if (!accept_ra(in6_dev)) - goto skip_linkparms; - - #ifdef CONFIG_IPV6_NDISC_NODETYPE -@@ -1309,8 +1320,7 @@ skip_linkparms: - NEIGH_UPDATE_F_ISROUTER); - } - -- /* skip route and link configuration on routers */ -- if (in6_dev->cnf.forwarding || !in6_dev->cnf.accept_ra) -+ if (!accept_ra(in6_dev)) - goto out; - - #ifdef CONFIG_IPV6_ROUTE_INFO |