X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=net%2Frose%2Frose_timer.c;h=b6c8f38cc26c42025ea9b6c63558f2d032c1f92d;hb=76a67ec6fb79ff3570dcb5342142c16098299911;hp=84dd4403f792d3c566cb0625965e8b902bcbbdf6;hpb=1da177e4c3f41524e886b7f1b8a0c1fc7321cac2;p=safe%2Fjmp%2Flinux-2.6

diff --git a/net/rose/rose_timer.c b/net/rose/rose_timer.c
index 84dd440..b6c8f38 100644
--- a/net/rose/rose_timer.c
+++ b/net/rose/rose_timer.c
@@ -22,7 +22,7 @@
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
-#include <net/tcp.h>
+#include <net/tcp_states.h>
 #include <asm/system.h>
 #include <linux/fcntl.h>
 #include <linux/mm.h>
@@ -138,6 +138,7 @@ static void rose_heartbeat_expiry(unsigned long param)
 		   is accepted() it isn't 'dead' so doesn't get removed. */
 		if (sock_flag(sk, SOCK_DESTROY) ||
 		    (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) {
+			bh_unlock_sock(sk);
 			rose_destroy_socket(sk);
 			return;
 		}