projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
[powerpc.git]
/
net
/
ipv6
/
anycast.c
diff --git
a/net/ipv6/anycast.c
b/net/ipv6/anycast.c
index
f6881d7
..
a960476
100644
(file)
--- a/
net/ipv6/anycast.c
+++ b/
net/ipv6/anycast.c
@@
-56,7
+56,7
@@
ip6_onlink(struct in6_addr *addr, struct net_device *dev)
int onlink;
onlink = 0;
int onlink;
onlink = 0;
- r
ead_lock(&addrconf_lock
);
+ r
cu_read_lock(
);
idev = __in6_dev_get(dev);
if (idev) {
read_lock_bh(&idev->lock);
idev = __in6_dev_get(dev);
if (idev) {
read_lock_bh(&idev->lock);
@@
-68,7
+68,7
@@
ip6_onlink(struct in6_addr *addr, struct net_device *dev)
}
read_unlock_bh(&idev->lock);
}
}
read_unlock_bh(&idev->lock);
}
- r
ead_unlock(&addrconf_lock
);
+ r
cu_read_unlock(
);
return onlink;
}
return onlink;
}
@@
-335,7
+335,7
@@
int ipv6_dev_ac_inc(struct net_device *dev, struct in6_addr *addr)
write_unlock_bh(&idev->lock);
dst_hold(&rt->u.dst);
write_unlock_bh(&idev->lock);
dst_hold(&rt->u.dst);
- if (ip6_ins_rt(rt
, NULL, NULL, NULL
))
+ if (ip6_ins_rt(rt))
dst_release(&rt->u.dst);
addrconf_join_solict(dev, &aca->aca_addr);
dst_release(&rt->u.dst);
addrconf_join_solict(dev, &aca->aca_addr);
@@
-378,7
+378,7
@@
int __ipv6_dev_ac_dec(struct inet6_dev *idev, struct in6_addr *addr)
addrconf_leave_solict(idev, &aca->aca_addr);
dst_hold(&aca->aca_rt->u.dst);
addrconf_leave_solict(idev, &aca->aca_addr);
dst_hold(&aca->aca_rt->u.dst);
- if (ip6_del_rt(aca->aca_rt
, NULL, NULL, NULL
))
+ if (ip6_del_rt(aca->aca_rt))
dst_free(&aca->aca_rt->u.dst);
else
dst_release(&aca->aca_rt->u.dst);
dst_free(&aca->aca_rt->u.dst);
else
dst_release(&aca->aca_rt->u.dst);