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 | 2fe5c1d12470049c95b2c9c7f6dc22ddbc343b9c (patch) | |
tree | 0cb98f29164e7e2f0f2b7b369d16a5164d6d1c1a /target/linux/generic/patches-2.6.36/301-ipv6_send_rs_when_forwarding.patch | |
parent | ca829e805baccb4e9549ed18c1dd622cdefa8bc6 (diff) | |
download | upstream-2fe5c1d12470049c95b2c9c7f6dc22ddbc343b9c.tar.gz upstream-2fe5c1d12470049c95b2c9c7f6dc22ddbc343b9c.tar.bz2 upstream-2fe5c1d12470049c95b2c9c7f6dc22ddbc343b9c.zip |
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
SVN-Revision: 24195
Diffstat (limited to 'target/linux/generic/patches-2.6.36/301-ipv6_send_rs_when_forwarding.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.36/301-ipv6_send_rs_when_forwarding.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.36/301-ipv6_send_rs_when_forwarding.patch b/target/linux/generic/patches-2.6.36/301-ipv6_send_rs_when_forwarding.patch new file mode 100644 index 0000000000..1252338e68 --- /dev/null +++ b/target/linux/generic/patches-2.6.36/301-ipv6_send_rs_when_forwarding.patch @@ -0,0 +1,12 @@ +--- a/net/ipv6/addrconf.c ++++ b/net/ipv6/addrconf.c +@@ -2964,7 +2964,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)) { |