diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-16 05:40:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-02 16:49:43 -0700 |
| commit | 29f84b1db493dd6062f29b92937466cc1a59440f (patch) | |
| tree | 269b9d65d37c8a938a1bc707e24c017e594355ab /include | |
| parent | e692eaafaf5d7c8aeef219959acaaa55702f5ebe (diff) | |
| download | linux-stable-29f84b1db493dd6062f29b92937466cc1a59440f.tar.gz linux-stable-29f84b1db493dd6062f29b92937466cc1a59440f.tar.bz2 linux-stable-29f84b1db493dd6062f29b92937466cc1a59440f.zip | |
x25: Fix sleep from timer on socket destroy.
[ Upstream commit 14ebaf81e13ce66bff275380b246796fd16cbfa1 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/x25.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/x25.h b/include/net/x25.h index fc3f03d976f8..2cda04011568 100644 --- a/include/net/x25.h +++ b/include/net/x25.h @@ -187,7 +187,7 @@ extern int x25_addr_ntoa(unsigned char *, struct x25_address *, extern int x25_addr_aton(unsigned char *, struct x25_address *, struct x25_address *); extern struct sock *x25_find_socket(unsigned int, struct x25_neigh *); -extern void x25_destroy_socket(struct sock *); +extern void x25_destroy_socket_from_timer(struct sock *); extern int x25_rx_call_request(struct sk_buff *, struct x25_neigh *, unsigned int); extern void x25_kill_by_neigh(struct x25_neigh *); |