From 787664213c1df6bbd5784c4e04a377f9da91d437 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Sun, 11 Oct 2009 12:19:21 +0200
Subject: [PATCH] --- yaml --- r: 167547 b: refs/heads/master c:
 edbfdcceb41c0cbfc1dd2cd28af2272190be47ad h: refs/heads/master i:   167545:
 205307515c170bca1114fdf89ff17693a4fad848   167543:
 4b2ebf78fc86f0c01806a160e91c7da24473471f v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/wireless/b43/xmit.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a61862b1e310..a5006cc16d6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51f98f1313d2fc4b1d3a3e1f4db7cf4925b29df6
+refs/heads/master: edbfdcceb41c0cbfc1dd2cd28af2272190be47ad
diff --git a/trunk/drivers/net/wireless/b43/xmit.c b/trunk/drivers/net/wireless/b43/xmit.c
index 892573b27d50..f4e9695ec186 100644
--- a/trunk/drivers/net/wireless/b43/xmit.c
+++ b/trunk/drivers/net/wireless/b43/xmit.c
@@ -690,7 +690,10 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
 	}
 
 	memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
+
+	local_bh_disable();
 	ieee80211_rx(dev->wl->hw, skb);
+	local_bh_enable();
 
 #if B43_DEBUG
 	dev->rx_count++;