diff options
| author | David S. Miller <davem@davemloft.net> | 2014-10-02 20:25:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-02 20:25:43 +0200 |
| commit | 739e4a758e0e2930f4bcdddd244254bae8dd7499 (patch) | |
| tree | 0179d038669ad55591ae05a90b210d7090edf56e /net/ipv6/addrconf.c | |
| parent | net: phy: add BCM7425 and BCM7429 PHYs (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-739e4a758e0e2930f4bcdddd244254bae8dd7499.tar.xz linux-739e4a758e0e2930f4bcdddd244254bae8dd7499.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/r8152.c
net/netfilter/nfnetlink.c
Both r8152 and nfnetlink conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index e189480f8fd6..725c763270a0 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -4783,10 +4783,11 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp) if (ip6_del_rt(ifp->rt)) dst_free(&ifp->rt->dst); + + rt_genid_bump_ipv6(net); break; } atomic_inc(&net->ipv6.dev_addr_genid); - rt_genid_bump_ipv6(net); } static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp) |