diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-21 15:18:55 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-21 15:18:55 +0000 |
commit | f480dd5941ebd6ea9622715f7b8d1e240d01c903 (patch) | |
tree | 0e218522de42e6e66e11362d3b24d31edb1f3dd5 /target/linux/generic/patches-2.6.30/300-ipv6_accept_ra_when_forwarding.patch | |
parent | 696e0160a59b1993df22c1dbd44855bee6fbfcfe (diff) |
linux/2.6.30: R.I.P.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31411 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.30/300-ipv6_accept_ra_when_forwarding.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.30/300-ipv6_accept_ra_when_forwarding.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/target/linux/generic/patches-2.6.30/300-ipv6_accept_ra_when_forwarding.patch b/target/linux/generic/patches-2.6.30/300-ipv6_accept_ra_when_forwarding.patch deleted file mode 100644 index b24ee9900..000000000 --- a/target/linux/generic/patches-2.6.30/300-ipv6_accept_ra_when_forwarding.patch +++ /dev/null @@ -1,30 +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); -@@ -1150,7 +1162,7 @@ static void ndisc_router_discovery(struc - skb->dev->name); - return; - } -- if (in6_dev->cnf.forwarding || !in6_dev->cnf.accept_ra) { -+ if (!accept_ra(in6_dev)) { - in6_dev_put(in6_dev); - return; - } |