diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 19:33:06 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 19:33:06 +0300 |
| commit | d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f (patch) | |
| tree | 8c21cc2ceaa11b7a6b023da6c8794f1e24eb0354 /net/ipv6/addrconf.c | |
| parent | d540c7428d297ab041e6cac72b9045e7b8f93f2b (diff) | |
| parent | 0dec456d1fe73e0539625f0973ee8ef8fb805943 (diff) | |
| download | linux-d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index d328d5986143..1db50487916b 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -3321,9 +3321,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp) switch (event) { case RTM_NEWADDR: - dst_hold(&ifp->rt->u.dst); - if (ip6_ins_rt(ifp->rt, NULL, NULL, NULL)) - dst_release(&ifp->rt->u.dst); + ip6_ins_rt(ifp->rt, NULL, NULL, NULL); if (ifp->idev->cnf.forwarding) addrconf_join_anycast(ifp); break; @@ -3334,8 +3332,6 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp) dst_hold(&ifp->rt->u.dst); if (ip6_del_rt(ifp->rt, NULL, NULL, NULL)) dst_free(&ifp->rt->u.dst); - else - dst_release(&ifp->rt->u.dst); break; } } |