diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 21:50:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 21:50:57 -0400 |
| commit | a5324343955997d1439f26518ddac567cd5d134b (patch) | |
| tree | f43558389c41e3a0f076c4ee55d77c4aa1561779 /net/ipv6/anycast.c | |
| parent | 8199d3a79c224bbe5943fa08684e1f93a17881b0 (diff) | |
| parent | a4936044001694f033fe4ea94d6034d51a6b465c (diff) | |
Merge /spare/repo/linux-2.6/
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); |