diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-17 17:10:04 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-17 17:10:04 +0000 |
commit | 97b250affa0451760b75ccf0cb7e7602807e3f58 (patch) | |
tree | feec3fdf3af7a39013f1c872146e85dd6576dec5 /target/linux/generic/patches-2.6.33/300-ipv6_accept_ra_when_forwarding.patch | |
parent | 579e608a9b94b75b83477abf173cd562779d9b41 (diff) |
generic: nuke 2.6.33 specific stuff, is not used by any platform
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24644 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.33/300-ipv6_accept_ra_when_forwarding.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.33/300-ipv6_accept_ra_when_forwarding.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/target/linux/generic/patches-2.6.33/300-ipv6_accept_ra_when_forwarding.patch b/target/linux/generic/patches-2.6.33/300-ipv6_accept_ra_when_forwarding.patch deleted file mode 100644 index 6827f32d6d..0000000000 --- a/target/linux/generic/patches-2.6.33/300-ipv6_accept_ra_when_forwarding.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/net/ipv6/ndisc.c -+++ b/net/ipv6/ndisc.c -@@ -1106,6 +1106,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); -@@ -1159,8 +1171,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 -@@ -1310,8 +1321,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 |