Skip to contentSkip to conversation

Fix routing table locking in rose_remove_neigh.

ROSE Applied Ralf Baechle 3 participants 3 messages Apr 29, 2006 – May 4, 2006

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Ralf Baechle

author
#0 lore raw

The locking rule for rose_remove_neigh() are that the called needs to hold rose_neigh_list_lock, so we better don't take it yet again in rose_neigh_list_lock.

Signed-off-by Ralf Baechle <[email protected]>
 net/rose/rose_route.c |    5 -----
 1 file changed, 5 deletions(-)
net/rose/rose_route.c +0 -5
Index: linux-net.git/net/rose/rose_route.c
===================================================================
@@ -233,11 +233,8 @@ static void rose_remove_neigh(struct ros
 
 	skb_queue_purge(&rose_neigh->queue);
 
-	spin_lock_bh(&rose_neigh_list_lock);
-
 	if ((s = rose_neigh_list) == rose_neigh) {
 		rose_neigh_list = rose_neigh->next;
-		spin_unlock_bh(&rose_neigh_list_lock);
 		kfree(rose_neigh->digipeat);
 		kfree(rose_neigh);
 		return;

@@ -246,7 +243,6 @@ static void rose_remove_neigh(struct ros
 	while (s != NULL && s->next != NULL) {
 		if (s->next == rose_neigh) {
 			s->next = rose_neigh->next;
-			spin_unlock_bh(&rose_neigh_list_lock);
 			kfree(rose_neigh->digipeat);
 			kfree(rose_neigh);
 			return;

@@ -254,7 +250,6 @@ static void rose_remove_neigh(struct ros
 
 		s = s->next;
 	}
-	spin_unlock_bh(&rose_neigh_list_lock);
 }
 
 /*