diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-06-18 17:25:11 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-07-24 15:05:31 -0400 |
| commit | 3d34deb6737b1ae1f8b7817b57d603807f5d88ea (patch) | |
| tree | 7b6cce16373973b5b7f7de6711536e5fd03c1677 /net | |
| parent | 72bce62775db0315511474e8d8f8e25d25b48366 (diff) | |
| download | linux-3d34deb6737b1ae1f8b7817b57d603807f5d88ea.tar.bz2 | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/tx.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 7adaeb2c53e8..a204092e8356 100644 --- 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(); } |