mac80211: fix ieee80211_xmit call context

ieee80211_xmit() cannot be called with tasklets enabled
because it is normally called from within a tasklet.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 7adaeb2c53e8025b26a69c29876753a4319d74bd..a204092e8356d587cab3a3503f1bb950110f3edc 100644 (file)
--- a/net/mac80211/tx.c
+++ b/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();
 }