diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2006-07-11 05:21:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-07-12 22:58:45 +0200 |
| commit | 8bf2b7b1888babe182a503437f6d40062aa84037 (patch) | |
| tree | ca77285eaa2bd8ecd5c6c93d41fdad4c55958feb /net/netrom/nr_timer.c | |
| parent | [NETROM]: Fix locking order when establishing a NETROM circuit. (diff) | |
| download | linux-8bf2b7b1888babe182a503437f6d40062aa84037.tar.xz linux-8bf2b7b1888babe182a503437f6d40062aa84037.zip | |
[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.c | 2 |
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) 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; } |