diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-07-17 21:31:33 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-17 21:31:33 +0200 |
| commit | d369f7b2b257ad6369b72d39e2f989833754a9ce (patch) | |
| tree | 0092a805f7a152ed161ee8995bb1672a7b74cced /drivers/net/wireless/mwl8k.c | |
| parent | bcma: add place for flash memory support (diff) | |
| parent | NFC: NCI module license 'unspecified' taints kernel (diff) | |
| download | linux-d369f7b2b257ad6369b72d39e2f989833754a9ce.tar.xz linux-d369f7b2b257ad6369b72d39e2f989833754a9ce.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/mwl8k.c')
| -rw-r--r-- | drivers/net/wireless/mwl8k.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index cf7bdc66f822..224e03ade145 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c @@ -1665,7 +1665,9 @@ mwl8k_txq_reclaim(struct ieee80211_hw *hw, int index, int limit, int force) info = IEEE80211_SKB_CB(skb); if (ieee80211_is_data(wh->frame_control)) { - sta = info->control.sta; + rcu_read_lock(); + sta = ieee80211_find_sta_by_ifaddr(hw, wh->addr1, + wh->addr2); if (sta) { sta_info = MWL8K_STA(sta); BUG_ON(sta_info == NULL); @@ -1682,6 +1684,7 @@ mwl8k_txq_reclaim(struct ieee80211_hw *hw, int index, int limit, int force) sta_info->is_ampdu_allowed = true; } } + rcu_read_unlock(); } ieee80211_tx_info_clear_status(info); |