diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-27 14:25:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-27 14:25:40 -0700 |
| commit | 7b9b04fb728ec0b94464ed902f3395aa592c5bcf (patch) | |
| tree | 67ac35b982e779312366d834694b3e35ea07062b /drivers/net | |
| parent | 59ea33a68a9083ac98515e4861c00e71efdc49a1 (diff) | |
| parent | 28ea499ac5b90f6266a24b826c6d469fc503758c (diff) | |
| download | linux-3.10-7b9b04fb728ec0b94464ed902f3395aa592c5bcf.tar.gz linux-3.10-7b9b04fb728ec0b94464ed902f3395aa592c5bcf.tar.bz2 linux-3.10-7b9b04fb728ec0b94464ed902f3395aa592c5bcf.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
These fixes are intended for the 3.6 stream.
Hauke Mehrtens provides a pair of bcma fixes, one to fix a build
regression on mips and another to correct a pair of missing iounmap
calls.
Thomas Huehn offers a mac80211_hwsim fix to avoid a possible
use-after-free bug.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -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 643f968b05e..00838395778 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 */ |