aboutsummaryrefslogtreecommitdiffstats
path: root/net/netrom/nr_timer.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-07-10 23:21:05 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-07-12 16:58:45 -0400
commit8bf2b7b1888babe182a503437f6d40062aa84037 (patch)
treeca77285eaa2bd8ecd5c6c93d41fdad4c55958feb /net/netrom/nr_timer.c
parent5cc29e3bea77092c48e5c71d792c7461e6a6c4cf (diff)
[NETROM]: Drop lock before calling nr_destroy_socket
nr_destroy_socket takes the socket lock itself so it should better be called with the socket unlocked. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netrom/nr_timer.c')
-rw-r--r--net/netrom/nr_timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c
index 75b72d389ba9..ddba1c144260 100644
--- a/net/netrom/nr_timer.c
+++ b/net/netrom/nr_timer.c
@@ -138,8 +138,8 @@ static void nr_heartbeat_expiry(unsigned long param)
138 if (sock_flag(sk, SOCK_DESTROY) || 138 if (sock_flag(sk, SOCK_DESTROY) ||
139 (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) { 139 (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) {
140 sock_hold(sk); 140 sock_hold(sk);
141 nr_destroy_socket(sk);
142 bh_unlock_sock(sk); 141 bh_unlock_sock(sk);
142 nr_destroy_socket(sk);
143 sock_put(sk); 143 sock_put(sk);
144 return; 144 return;
145 } 145 }