Commit 3d34deb6 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 72bce627

net/mac80211/tx.c

+7 −0
Original line number Diff line number Diff line
@@ -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();

}