asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ipv6: clean up ipv6_dev_ac_inc()

Browse source 
Make it accept inet6_dev, and rename it to __ipv6_dev_ac_inc()
to reflect this change.

Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
WANG Cong 2014-09-11 15:35:11 -07:00 committed by David S. Miller
parent b03a9c04a3
commit 013b4d9038
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/net/addrconf.h
View file

@ -202,7 +202,7 @@ int ipv6_sock_ac_drop(struct sock *sk, int ifindex,
const struct in6_addr *addr); const struct in6_addr *addr);
void ipv6_sock_ac_close(struct sock *sk); void ipv6_sock_ac_close(struct sock *sk);
int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr); int __ipv6_dev_ac_inc(struct inet6_dev *idev, const struct in6_addr *addr);
int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr); int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr);
bool ipv6_chk_acast_addr(struct net *net, struct net_device *dev, bool ipv6_chk_acast_addr(struct net *net, struct net_device *dev,
const struct in6_addr *addr); const struct in6_addr *addr);

2
net/ipv6/addrconf.c
View file

@ -1725,7 +1725,7 @@ static void addrconf_join_anycast(struct inet6_ifaddr *ifp)
ipv6_addr_prefix(&addr, &ifp->addr, ifp->prefix_len); ipv6_addr_prefix(&addr, &ifp->addr, ifp->prefix_len);
if (ipv6_addr_any(&addr)) if (ipv6_addr_any(&addr))
return; return;
ipv6_dev_ac_inc(ifp->idev->dev, &addr); __ipv6_dev_ac_inc(ifp->idev, &addr);
} }
/* caller must hold RTNL */ /* caller must hold RTNL */

13
net/ipv6/anycast.c
View file

@ -122,7 +122,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
goto error; goto error;
} }
err = ipv6_dev_ac_inc(dev, addr); err = __ipv6_dev_ac_inc(idev, addr);
if (!err) { if (!err) {
pac->acl_next = np->ipv6_ac_list; pac->acl_next = np->ipv6_ac_list;
np->ipv6_ac_list = pac; np->ipv6_ac_list = pac;
@ -215,20 +215,15 @@ static void aca_put(struct ifacaddr6 *ac)
/* /*
* device anycast group inc (add if not found) * device anycast group inc (add if not found)
*/ */
int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr) int __ipv6_dev_ac_inc(struct inet6_dev *idev, const struct in6_addr *addr)
{ {
struct ifacaddr6 *aca; struct ifacaddr6 *aca;
struct inet6_dev *idev;
struct rt6_info *rt; struct rt6_info *rt;
int err; int err;
ASSERT_RTNL(); ASSERT_RTNL();
idev = in6_dev_get(dev); in6_dev_hold(idev);
if (idev == NULL)
return -EINVAL;
write_lock_bh(&idev->lock); write_lock_bh(&idev->lock);
if (idev->dead) { if (idev->dead) {
err = -ENODEV; err = -ENODEV;
@ -276,7 +271,7 @@ int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr)
ip6_ins_rt(rt); ip6_ins_rt(rt);
addrconf_join_solict(dev, &aca->aca_addr); addrconf_join_solict(idev->dev, &aca->aca_addr);
aca_put(aca); aca_put(aca);
return 0; return 0;