diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-13 16:38:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-13 16:38:53 -0400 |
| commit | 4361eb664de09a9f60955c7f5e9355f7ed46a08d (patch) | |
| tree | 1456a054df7e78b1e4f10fac2041b3673e2b35de /net/ipv6/addrconf.c | |
| parent | 8801d48cbde6ddd275c1e6b866e434a72cafeabd (diff) | |
| parent | 1691c63ea42d6f57ba769df401b9773664edb936 (diff) | |
Merge branch 'ipv6-cleanups'
Cong Wang says:
====================
ipv6: clean up locking code in anycast and mcast
This patchset cleans up the locking code in anycast.c and mcast.c
and makes the refcount code more readable.
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
v1 -> v2:
* refactor some code and make it in a separated patch
* update comments
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index ad4598fcc416..6b6a373a30b2 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -1725,7 +1725,7 @@ static void addrconf_join_anycast(struct inet6_ifaddr *ifp) ipv6_addr_prefix(&addr, &ifp->addr, ifp->prefix_len); if (ipv6_addr_any(&addr)) return; - ipv6_dev_ac_inc(ifp->idev->dev, &addr); + __ipv6_dev_ac_inc(ifp->idev, &addr); } /* caller must hold RTNL */ |