From 9301ffacf94d5743841e419e809038b0c889be48 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 18 Jun 2009 17:25:11 +0200
Subject: [PATCH] --- yaml --- r: 159191 b: refs/heads/master c:
 3d34deb6737b1ae1f8b7817b57d603807f5d88ea h: refs/heads/master i:   159189:
 c6df5d3d345adec6f0919036d354a60811d42ff0   159187:
 48b8b94262e5549627af3cbb3a0196b277e6f2d1   159183:
 65322dbcafc9456d124934f1b72f99fd0bcdb0b3 v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/tx.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0f1d58aeefbc..0b17ab77a8b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72bce62775db0315511474e8d8f8e25d25b48366
+refs/heads/master: 3d34deb6737b1ae1f8b7817b57d603807f5d88ea
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index 7adaeb2c53e8..a204092e8356 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -2241,5 +2241,12 @@ void ieee80211_tx_skb(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,
 	if (!encrypt)
 		info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
 
+	/*
+	 * The other path calling ieee80211_xmit is from the tasklet,
+	 * and while we can handle concurrent transmissions locking
+	 * requirements are that we do not come into tx with bhs on.
+	 */
+	local_bh_disable();
 	ieee80211_xmit(sdata, skb);
+	local_bh_enable();
 }