diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-06-16 05:40:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-16 05:40:30 -0700 |
| commit | 14ebaf81e13ce66bff275380b246796fd16cbfa1 (patch) | |
| tree | 6da2824a42a07f325787130d093e1a986fa29110 /net/x25/x25_timer.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 (diff) | |
| download | linux-dev-14ebaf81e13ce66bff275380b246796fd16cbfa1.tar.xz linux-dev-14ebaf81e13ce66bff275380b246796fd16cbfa1.zip | |
x25: Fix sleep from timer on socket destroy.
If socket destuction gets delayed to a timer, we try to
lock_sock() from that timer which won't work.
Use bh_lock_sock() in that case.
Signed-off-by: David S. Miller <davem@davemloft.net>
Tested-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/x25/x25_timer.c')
| -rw-r--r-- | net/x25/x25_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/x25/x25_timer.c b/net/x25/x25_timer.c index d3e3e54db936..5c5db1a36399 100644 --- a/net/x25/x25_timer.c +++ b/net/x25/x25_timer.c @@ -113,7 +113,7 @@ static void x25_heartbeat_expiry(unsigned long param) (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) { bh_unlock_sock(sk); - x25_destroy_socket(sk); + x25_destroy_socket_from_timer(sk); return; } break; |