summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-2.6.30/301-ipv6_send_rs_when_forwarding.patch
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-30 01:52:51 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-30 01:52:51 +0000
commit291a485aceaa1a2ce4cf6f8a2bf3d3d581d68a14 (patch)
treed695c6581fd12401ba3b9576432e058b5db23dec /target/linux/generic/patches-2.6.30/301-ipv6_send_rs_when_forwarding.patch
parent293671d95220f0d12a9f3194e54e271d51191f08 (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.30/301-ipv6_send_rs_when_forwarding.patch')
-rw-r--r--target/linux/generic/patches-2.6.30/301-ipv6_send_rs_when_forwarding.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.30/301-ipv6_send_rs_when_forwarding.patch b/target/linux/generic/patches-2.6.30/301-ipv6_send_rs_when_forwarding.patch
new file mode 100644
index 0000000000..b4fef3f91a
--- /dev/null
+++ b/target/linux/generic/patches-2.6.30/301-ipv6_send_rs_when_forwarding.patch
@@ -0,0 +1,12 @@
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -2839,7 +2839,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)) {