diff options
| author | John W. Linville | 2012-07-27 17:15:03 +0200 |
|---|---|---|
| committer | John W. Linville | 2012-07-27 17:15:03 +0200 |
| commit | 28ea499ac5b90f6266a24b826c6d469fc503758c (patch) | |
| tree | 62dc50b7ce3fb735f125762c8134dd778024812b /drivers/net/wireless | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| parent | bcma: add missing iounmap on error path (diff) | |
| download | kernel-qcow2-linux-28ea499ac5b90f6266a24b826c6d469fc503758c.tar.gz kernel-qcow2-linux-28ea499ac5b90f6266a24b826c6d469fc503758c.tar.xz kernel-qcow2-linux-28ea499ac5b90f6266a24b826c6d469fc503758c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless')
| -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 643f968b05ee..00838395778c 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -739,11 +739,6 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 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); /* frame was transmitted at most favorable rate at first attempt */ |