From fba7208eebf58710551637d21518f8ea04daebb2 Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Sun, 16 Dec 2007 14:02:07 -0800
Subject: [PATCH] --- yaml --- r: 74883 b: refs/heads/master c:
 215f7b08f2a142ec19f4bd3d6de263e68b877955 h: refs/heads/master i:   74881:
 f964678563231d3785113b57107bb030eaaa6e24   74879:
 3f77e8fe9de5f5716043e886846acc42e06a4495 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ax25/ax25_subr.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 777f82be8e07..d3a8ed40e950 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 488faa2ae32c2f8b1ffda5c7fae5eb7c979acc15
+refs/heads/master: 215f7b08f2a142ec19f4bd3d6de263e68b877955
diff --git a/trunk/net/ax25/ax25_subr.c b/trunk/net/ax25/ax25_subr.c
index 5fe9b2a6697d..d8f215733175 100644
--- a/trunk/net/ax25/ax25_subr.c
+++ b/trunk/net/ax25/ax25_subr.c
@@ -279,6 +279,7 @@ void ax25_disconnect(ax25_cb *ax25, int reason)
 	ax25_link_failed(ax25, reason);
 
 	if (ax25->sk != NULL) {
+		local_bh_disable();
 		bh_lock_sock(ax25->sk);
 		ax25->sk->sk_state     = TCP_CLOSE;
 		ax25->sk->sk_err       = reason;
@@ -288,5 +289,6 @@ void ax25_disconnect(ax25_cb *ax25, int reason)
 			sock_set_flag(ax25->sk, SOCK_DEAD);
 		}
 		bh_unlock_sock(ax25->sk);
+		local_bh_enable();
 	}
 }