diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
| commit | 29516d75a0b09e0a0328dd55c98a342515c9615a (patch) | |
| tree | 4b03326311958ad6de82653a1caf289ad8c38538 /net/ipv6/anycast.c | |
| parent | 4ea78729b8dbfc400fe165a57b90a394a7275a54 (diff) | |
| parent | 4a4f8fdba6f5a34ca90f426021e17491a30202da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'net/ipv6/anycast.c')
| -rw-r--r-- | net/ipv6/anycast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c index 5d22ca3cca2e..6b7294047238 100644 --- a/net/ipv6/anycast.c +++ b/net/ipv6/anycast.c | |||
| @@ -337,7 +337,7 @@ int ipv6_dev_ac_inc(struct net_device *dev, struct in6_addr *addr) | |||
| 337 | write_unlock_bh(&idev->lock); | 337 | write_unlock_bh(&idev->lock); |
| 338 | 338 | ||
| 339 | dst_hold(&rt->u.dst); | 339 | dst_hold(&rt->u.dst); |
| 340 | if (ip6_ins_rt(rt, NULL, NULL)) | 340 | if (ip6_ins_rt(rt, NULL, NULL, NULL)) |
| 341 | dst_release(&rt->u.dst); | 341 | dst_release(&rt->u.dst); |
| 342 | 342 | ||
| 343 | addrconf_join_solict(dev, &aca->aca_addr); | 343 | addrconf_join_solict(dev, &aca->aca_addr); |
| @@ -380,7 +380,7 @@ int __ipv6_dev_ac_dec(struct inet6_dev *idev, struct in6_addr *addr) | |||
| 380 | addrconf_leave_solict(idev, &aca->aca_addr); | 380 | addrconf_leave_solict(idev, &aca->aca_addr); |
| 381 | 381 | ||
| 382 | dst_hold(&aca->aca_rt->u.dst); | 382 | dst_hold(&aca->aca_rt->u.dst); |
| 383 | if (ip6_del_rt(aca->aca_rt, NULL, NULL)) | 383 | if (ip6_del_rt(aca->aca_rt, NULL, NULL, NULL)) |
| 384 | dst_free(&aca->aca_rt->u.dst); | 384 | dst_free(&aca->aca_rt->u.dst); |
| 385 | else | 385 | else |
| 386 | dst_release(&aca->aca_rt->u.dst); | 386 | dst_release(&aca->aca_rt->u.dst); |