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.32/301-ipv6_send_rs_when_forwarding.patch | |
parent | 1c91659cecaac045a0b6b97b7b5306d6d883d194 (diff) | |
download | master-187ad058-1e03d225f01554d1020305d1808227d20744a7e0.tar.gz master-187ad058-1e03d225f01554d1020305d1808227d20744a7e0.tar.bz2 master-187ad058-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.32/301-ipv6_send_rs_when_forwarding.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.32/301-ipv6_send_rs_when_forwarding.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.32/301-ipv6_send_rs_when_forwarding.patch b/target/linux/generic/patches-2.6.32/301-ipv6_send_rs_when_forwarding.patch new file mode 100644 index 0000000000..fab7f89f49 --- /dev/null +++ b/target/linux/generic/patches-2.6.32/301-ipv6_send_rs_when_forwarding.patch @@ -0,0 +1,12 @@ +--- a/net/ipv6/addrconf.c ++++ b/net/ipv6/addrconf.c +@@ -2888,7 +2888,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)) { |