diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-07-17 21:07:31 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-17 21:07:31 +0200 |
| commit | 707be0ae13f7a4533d11f0d88687223c4bd8f85f (patch) | |
| tree | cf2c9fa680828ea4a9882ee2561e9b12d643adbe /drivers | |
| parent | wireless: brcm80211: use %pM to print BSSID (diff) | |
| parent | mac80211: go out of PS before sending disassoc (diff) | |
| download | linux-707be0ae13f7a4533d11f0d88687223c4bd8f85f.tar.xz linux-707be0ae13f7a4533d11f0d88687223c4bd8f85f.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 3f38d846b093..826ac7bec73f 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -1540,11 +1540,6 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2, /* now send back TX status */ txi = IEEE80211_SKB_CB(skb); - if (txi->control.vif) - hwsim_check_magic(txi->control.vif); - if (txi->control.sta) - hwsim_check_sta_magic(txi->control.sta); - ieee80211_tx_info_clear_status(txi); for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) { |