From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 11 Jul 2006 03:21:05 +0000 (-0700)
Subject: [NETROM]: Drop lock before calling nr_destroy_socket
X-Git-Tag: v2.6.18-rc2~93^2~14
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bf2b7b1888babe182a503437f6d40062aa84037;p=linux-2.6

[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>
---

diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c
index 75b72d389b..ddba1c1442 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)
 		if (sock_flag(sk, SOCK_DESTROY) ||
 		    (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) {
 			sock_hold(sk);
-			nr_destroy_socket(sk);
 			bh_unlock_sock(sk);
+			nr_destroy_socket(sk);
 			sock_put(sk);
 			return;
 		}