Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14563
b: refs/heads/master
c: 5d5780d
h: refs/heads/master
i:
  14561: 330a32d
  14559: 392504b
v: v3
  • Loading branch information
Yan Zheng authored and David S. Miller committed Nov 20, 2005
1 parent 2010f52 commit b72f799
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4909724b5dee8fb7c52bbe90afa40c65b17be9eb
refs/heads/master: 5d5780df23537ad0db72267fe11103d2c23d9b2a
10 changes: 5 additions & 5 deletions trunk/net/ipv6/addrconf.c
Original file line number Diff line number Diff line change
Expand Up @@ -2627,7 +2627,7 @@ static void addrconf_verify(unsigned long foo)
for (i=0; i < IN6_ADDR_HSIZE; i++) {

restart:
write_lock(&addrconf_hash_lock);
read_lock(&addrconf_hash_lock);
for (ifp=inet6_addr_lst[i]; ifp; ifp=ifp->lst_next) {
unsigned long age;
#ifdef CONFIG_IPV6_PRIVACY
Expand All @@ -2649,7 +2649,7 @@ static void addrconf_verify(unsigned long foo)
if (age >= ifp->valid_lft) {
spin_unlock(&ifp->lock);
in6_ifa_hold(ifp);
write_unlock(&addrconf_hash_lock);
read_unlock(&addrconf_hash_lock);
ipv6_del_addr(ifp);
goto restart;
} else if (age >= ifp->prefered_lft) {
Expand All @@ -2668,7 +2668,7 @@ static void addrconf_verify(unsigned long foo)

if (deprecate) {
in6_ifa_hold(ifp);
write_unlock(&addrconf_hash_lock);
read_unlock(&addrconf_hash_lock);

ipv6_ifa_notify(0, ifp);
in6_ifa_put(ifp);
Expand All @@ -2686,7 +2686,7 @@ static void addrconf_verify(unsigned long foo)
in6_ifa_hold(ifp);
in6_ifa_hold(ifpub);
spin_unlock(&ifp->lock);
write_unlock(&addrconf_hash_lock);
read_unlock(&addrconf_hash_lock);
ipv6_create_tempaddr(ifpub, ifp);
in6_ifa_put(ifpub);
in6_ifa_put(ifp);
Expand All @@ -2703,7 +2703,7 @@ static void addrconf_verify(unsigned long foo)
spin_unlock(&ifp->lock);
}
}
write_unlock(&addrconf_hash_lock);
read_unlock(&addrconf_hash_lock);
}

addr_chk_timer.expires = time_before(next, jiffies + HZ) ? jiffies + HZ : next;
Expand Down

0 comments on commit b72f799

Please sign in to comment.