diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-11-30 01:52:51 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-11-30 01:52:51 +0000 |
| commit | 291a485aceaa1a2ce4cf6f8a2bf3d3d581d68a14 (patch) | |
| tree | d695c6581fd12401ba3b9576432e058b5db23dec /target/linux/generic/patches-2.6.33/300-ipv6_accept_ra_when_forwarding.patch | |
| parent | 293671d95220f0d12a9f3194e54e271d51191f08 (diff) | |
[kernel] backport two changes from kernel.org:
65e9b62d4503849b10bedfc29bff0473760cc597
ipv6: add special mode accept_ra=2 to accept RA while configured as router
c3bccac2fa76f1619dfe4fb7b9bee69de7f066d8
ipv6: add special mode forwarding=2 to send RS while configured as router
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24195 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, 41 insertions, 0 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 new file mode 100644 index 0000000000..6827f32d6d --- /dev/null +++ b/target/linux/generic/patches-2.6.33/300-ipv6_accept_ra_when_forwarding.patch @@ -0,0 +1,41 @@ +--- 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 |