diff options
author | stephen hemminger <shemminger@vyatta.com> | 2010-04-12 01:41:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-13 05:29:28 -0400 |
commit | d1f84c63a465d6ba16955930519b7f68c550cae1 (patch) | |
tree | adbe1e3b752f62e3f2e04b54ad82952bd0bd9e5d | |
parent | 27bdb2abcc5edb3526e25407b74bf17d1872c329 (diff) |
ipv6: additional ref count for hash list unnecessary
Since an address in hash list has to already have a ref count,
no additional ref count is needed.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv6/addrconf.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 9d78c1229497..a0175edb6589 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -676,7 +676,6 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr, int pfxlen, | |||
676 | hash = ipv6_addr_hash(addr); | 676 | hash = ipv6_addr_hash(addr); |
677 | 677 | ||
678 | hlist_add_head_rcu(&ifa->addr_lst, &inet6_addr_lst[hash]); | 678 | hlist_add_head_rcu(&ifa->addr_lst, &inet6_addr_lst[hash]); |
679 | in6_ifa_hold(ifa); | ||
680 | spin_unlock(&addrconf_hash_lock); | 679 | spin_unlock(&addrconf_hash_lock); |
681 | 680 | ||
682 | write_lock(&idev->lock); | 681 | write_lock(&idev->lock); |
@@ -724,7 +723,6 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp) | |||
724 | 723 | ||
725 | spin_lock_bh(&addrconf_hash_lock); | 724 | spin_lock_bh(&addrconf_hash_lock); |
726 | hlist_del_init_rcu(&ifp->addr_lst); | 725 | hlist_del_init_rcu(&ifp->addr_lst); |
727 | __in6_ifa_put(ifp); | ||
728 | spin_unlock_bh(&addrconf_hash_lock); | 726 | spin_unlock_bh(&addrconf_hash_lock); |
729 | 727 | ||
730 | write_lock_bh(&idev->lock); | 728 | write_lock_bh(&idev->lock); |
@@ -2713,7 +2711,6 @@ static int addrconf_ifdown(struct net_device *dev, int how) | |||
2713 | /* clear hash table */ | 2711 | /* clear hash table */ |
2714 | spin_lock_bh(&addrconf_hash_lock); | 2712 | spin_lock_bh(&addrconf_hash_lock); |
2715 | hlist_del_init_rcu(&ifa->addr_lst); | 2713 | hlist_del_init_rcu(&ifa->addr_lst); |
2716 | __in6_ifa_put(ifa); | ||
2717 | spin_unlock_bh(&addrconf_hash_lock); | 2714 | spin_unlock_bh(&addrconf_hash_lock); |
2718 | } | 2715 | } |
2719 | 2716 | ||