---

yaml --- r: 12112 b: refs/heads/master c: a3d7a9d h: refs/heads/master v: v3
git-mirror · Oct 31, 2005 · ac3e5be · ac3e5be
1 parent 9ca2f02
commit ac3e5be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b7d31fcdda5938e5d3f1f8b0922cc25aa200dfc
+refs/heads/master: a3d7a9d77533d7516a8cfb8e2b612cd5ead4fa59
diff --git a/trunk/net/rose/rose_timer.c b/trunk/net/rose/rose_timer.c
@@ -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;
 		}