X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fx25%2Fx25_timer.c;h=5c5db1a36399d1ef26d24df168ceb47b871b1e3d;hb=e7588cfc3445492a2020cb4a205a7258dd1d5d6a;hp=d3e3e54db936a738d13de9756799796b40dc9dc3;hpb=aef8755711a28bb0ecde7780ae6613fcb62cf6f7;p=pandora-kernel.git

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;