diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-07 16:29:30 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-07 16:29:30 -0500 |
| commit | 3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch) | |
| tree | f4abe2f05e173023d2a262afd4aebb1e89fe6985 /net/ipv6/addrconf.c | |
| parent | 76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff) | |
| parent | 926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff) | |
| download | lwn-3efa70d78f218e4c9276b0bac0545e5184c1c47b.tar.gz lwn-3efa70d78f218e4c9276b0bac0545e5184c1c47b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 156ed578d3c0..a69ae7d4e6f8 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -3393,9 +3393,15 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, } if (idev) { - if (idev->if_flags & IF_READY) - /* device is already configured. */ + if (idev->if_flags & IF_READY) { + /* device is already configured - + * but resend MLD reports, we might + * have roamed and need to update + * multicast snooping switches + */ + ipv6_mc_up(idev); break; + } idev->if_flags |= IF_READY; } |