diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-09 14:34:20 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-09 14:34:20 -0800 |
| commit | b2d3298e0916fa059712691c85a0e97becc4ab9f (patch) | |
| tree | c7d5ea46a9dbf9cebdb122df4aaf0beda6e7621e /net/ipv6 | |
| parent | 1a0bdadb4e36abac63b0a9787f372aac30c11a9e (diff) | |
| parent | a7f4255f906f60f72e00aad2fb000939449ff32e (diff) | |
| download | linux-b2d3298e0916fa059712691c85a0e97becc4ab9f.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/addrconf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index c02280a4d126..6b8ebc5da0e1 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -434,6 +434,10 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev) /* Join all-node multicast group */ ipv6_dev_mc_inc(dev, &in6addr_linklocal_allnodes); + /* Join all-router multicast group if forwarding is set */ + if (ndev->cnf.forwarding && dev && (dev->flags & IFF_MULTICAST)) + ipv6_dev_mc_inc(dev, &in6addr_linklocal_allrouters); + return ndev; } |