diff --git a/[refs] b/[refs] index 7ac8b3c4d939..262893611263 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5f5e3689c8682e06ba155676d69ccf3f4172cb4 +refs/heads/master: 96d796a38e9ec9a7c04a6cda3fc15d79efebb008 diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c index fd6782e3a038..3daaf3c7703c 100644 --- a/trunk/net/ipv6/addrconf.c +++ b/trunk/net/ipv6/addrconf.c @@ -718,12 +718,9 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp) struct inet6_ifaddr *ifa, *ifn; struct inet6_dev *idev = ifp->idev; int state; - int hash; int deleted = 0, onlink = 0; unsigned long expires = jiffies; - hash = ipv6_addr_hash(&ifp->addr); - spin_lock_bh(&ifp->state_lock); state = ifp->state; ifp->state = INET6_IFADDR_STATE_DEAD;