summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mac80211_hwsim.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-09-06 15:55:50 +0200
committerJohannes Berg <johannes.berg@intel.com>2012-09-06 15:56:02 +0200
commit944b9e375d89271c39995d363f62cb91734fae5f (patch)
treebd6014bd0be251cdf2b32b12ca8a62e55742c0ee /drivers/net/wireless/mac80211_hwsim.c
parenta4ed53466a289a4139405bf7190c78a8e9d8debf (diff)
parent7ce8c7a3433c6d6f4adfec0611d250782f0b4b0c (diff)
downloadblackbird-op-linux-944b9e375d89271c39995d363f62cb91734fae5f.tar.gz
blackbird-op-linux-944b9e375d89271c39995d363f62cb91734fae5f.zip
Merge remote-tracking branch 'mac80211/master' into mac80211-next
Pull in mac80211.git to let the next patch apply without conflicts, also resolving a hwsim conflict. Conflicts: drivers/net/wireless/mac80211_hwsim.c Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/mac80211_hwsim.c')
-rw-r--r--drivers/net/wireless/mac80211_hwsim.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 7bb032e1b789..72b0456e41bf 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -741,11 +741,6 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw,
txi = IEEE80211_SKB_CB(skb);
- if (txi->control.vif)
- hwsim_check_magic(txi->control.vif);
- if (control->sta)
- hwsim_check_sta_magic(control->sta);
-
ieee80211_tx_info_clear_status(txi);
/* frame was transmitted at most favorable rate at first attempt */
OpenPOWER on IntegriCloud