[backfire] merge r24195
[openwrt-10.03/.git] / target / linux / generic-2.6 / patches-2.6.30 / 301-ipv6_send_rs_when_forwarding.patch
1 --- a/net/ipv6/addrconf.c
2 +++ b/net/ipv6/addrconf.c
3 @@ -2839,7 +2839,8 @@ static void addrconf_dad_completed(struc
4            start sending router solicitations.
5          */
6  
7 -       if (ifp->idev->cnf.forwarding == 0 &&
8 +       if ((ifp->idev->cnf.forwarding == 0 ||
9 +            ifp->idev->cnf.forwarding == 2) &&
10             ifp->idev->cnf.rtr_solicits > 0 &&
11             (dev->flags&IFF_LOOPBACK) == 0 &&
12             (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {