summaryrefslogtreecommitdiff
path: root/include/net/x25.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-06-16 16:40:30 +0400
committerDavid S. Miller <davem@davemloft.net>2009-06-16 16:40:30 +0400
commit14ebaf81e13ce66bff275380b246796fd16cbfa1 (patch)
tree6da2824a42a07f325787130d093e1a986fa29110 /include/net/x25.h
parenta1870b9cc280fe16fed13994810f8a1687be3bcf (diff)
downloadlinux-14ebaf81e13ce66bff275380b246796fd16cbfa1.tar.xz
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 'include/net/x25.h')
-rw-r--r--include/net/x25.h2
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 *);