public inbox for linux-wireless@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH -testing] mac80211: fix ieee80211_xmit call context
@ 2009-06-18 15:25 Johannes Berg
  0 siblings, 0 replies; only message in thread
From: Johannes Berg @ 2009-06-18 15:25 UTC (permalink / raw)
  To: John Linville; +Cc: linux-wireless

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>
---
Fixes a problem with the mdev removal.

 net/mac80211/tx.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- wireless-testing.orig/net/mac80211/tx.c	2009-06-18 17:21:45.000000000 +0200
+++ wireless-testing/net/mac80211/tx.c	2009-06-18 17:23:49.000000000 +0200
@@ -2221,5 +2221,12 @@ void ieee80211_tx_skb(struct ieee80211_s
 	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();
 }



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-06-18 15:25 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-18 15:25 [PATCH -testing] mac80211: fix ieee80211_xmit call context Johannes Berg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox