From 370a9c6653878920e57e95dcece21493c8e2722c Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 3 May 2006 23:26:20 -0700 Subject: [PATCH] --- yaml --- r: 26484 b: refs/heads/master c: 4cc7c2734e2b4032103e47d8f3e8b6fa3360d3f1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/rose/rose_route.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6db99ebb705c..02d7fc09919c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70868eace5031298c6f6e991a40a2106957f582c +refs/heads/master: 4cc7c2734e2b4032103e47d8f3e8b6fa3360d3f1 diff --git a/trunk/net/rose/rose_route.c b/trunk/net/rose/rose_route.c index 4cb6bfa6fcbd..a22542fa1bc8 100644 --- a/trunk/net/rose/rose_route.c +++ b/trunk/net/rose/rose_route.c @@ -233,11 +233,8 @@ static void rose_remove_neigh(struct rose_neigh *rose_neigh) 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 rose_neigh *rose_neigh) 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 rose_neigh *rose_neigh) s = s->next; } - spin_unlock_bh(&rose_neigh_list_lock); } /*