X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2Fx25%2Fx25_timer.c;h=5c5db1a36399d1ef26d24df168ceb47b871b1e3d;hb=21fe3c5245647d200a7ba25d42b80d21c578a8dc;hp=d3e3e54db936a738d13de9756799796b40dc9dc3;hpb=4f4ae0d42680889c62db4e1f3e6b4aa7787a7257;p=~andy%2Flinux

diff --git a/net/x25/x25_timer.c b/net/x25/x25_timer.c
index d3e3e54db93..5c5db1a3639 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;