diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-11-30 01:52:51 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-11-30 01:52:51 +0000 |
| commit | 1e03d225f01554d1020305d1808227d20744a7e0 (patch) | |
| tree | d695c6581fd12401ba3b9576432e058b5db23dec /target/linux/generic/patches-2.6.34 | |
| parent | 1c91659cecaac045a0b6b97b7b5306d6d883d194 (diff) | |
| download | upstream-1e03d225f01554d1020305d1808227d20744a7e0.tar.gz upstream-1e03d225f01554d1020305d1808227d20744a7e0.tar.bz2 upstream-1e03d225f01554d1020305d1808227d20744a7e0.zip | |
[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.34')
| -rw-r--r-- | target/linux/generic/patches-2.6.34/300-ipv6_accept_ra_when_forwarding.patch | 41 | ||||
| -rw-r--r-- | target/linux/generic/patches-2.6.34/301-ipv6_send_rs_when_forwarding.patch | 12 |
2 files changed, 53 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.34/300-ipv6_accept_ra_when_forwarding.patch b/target/linux/generic/patches-2.6.34/300-ipv6_accept_ra_when_forwarding.patch new file mode 100644 index 0000000000..265ae6b2b8 --- /dev/null +++ b/target/linux/generic/patches-2.6.34/300-ipv6_accept_ra_when_forwarding.patch @@ -0,0 +1,41 @@ +--- a/net/ipv6/ndisc.c ++++ b/net/ipv6/ndisc.c +@@ -1107,6 +1107,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); +@@ -1160,8 +1172,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 +@@ -1311,8 +1322,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 diff --git a/target/linux/generic/patches-2.6.34/301-ipv6_send_rs_when_forwarding.patch b/target/linux/generic/patches-2.6.34/301-ipv6_send_rs_when_forwarding.patch new file mode 100644 index 0000000000..4007965901 --- /dev/null +++ b/target/linux/generic/patches-2.6.34/301-ipv6_send_rs_when_forwarding.patch @@ -0,0 +1,12 @@ +--- a/net/ipv6/addrconf.c ++++ b/net/ipv6/addrconf.c +@@ -2924,7 +2924,8 @@ static void addrconf_dad_completed(struc + start sending router solicitations. + */ + +- if (ifp->idev->cnf.forwarding == 0 && ++ if ((ifp->idev->cnf.forwarding == 0 || ++ ifp->idev->cnf.forwarding == 2) && + ifp->idev->cnf.rtr_solicits > 0 && + (dev->flags&IFF_LOOPBACK) == 0 && + (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) { |