git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
net
/
x25
/
x25_timer.c
diff --git
a/net/x25/x25_timer.c
b/net/x25/x25_timer.c
index
d6a21a3
..
71ff308
100644
(file)
--- a/
net/x25/x25_timer.c
+++ b/
net/x25/x25_timer.c
@@
-23,7
+23,7
@@
#include <linux/jiffies.h>
#include <linux/timer.h>
#include <net/sock.h>
#include <linux/jiffies.h>
#include <linux/timer.h>
#include <net/sock.h>
-#include <net/tcp.h>
+#include <net/tcp
_states
.h>
#include <net/x25.h>
static void x25_heartbeat_expiry(unsigned long);
#include <net/x25.h>
static void x25_heartbeat_expiry(unsigned long);
@@
-114,8
+114,9
@@
static void x25_heartbeat_expiry(unsigned long param)
if (sock_flag(sk, SOCK_DESTROY) ||
(sk->sk_state == TCP_LISTEN &&
sock_flag(sk, SOCK_DEAD))) {
if (sock_flag(sk, SOCK_DESTROY) ||
(sk->sk_state == TCP_LISTEN &&
sock_flag(sk, SOCK_DEAD))) {
+ bh_unlock_sock(sk);
x25_destroy_socket(sk);
x25_destroy_socket(sk);
-
goto unlock
;
+
return
;
}
break;
}
break;
@@
-128,7
+129,6
@@
static void x25_heartbeat_expiry(unsigned long param)
}
restart_heartbeat:
x25_start_heartbeat(sk);
}
restart_heartbeat:
x25_start_heartbeat(sk);
-unlock:
bh_unlock_sock(sk);
}
bh_unlock_sock(sk);
}