summaryrefslogtreecommitdiffstats
path: root/net/mac80211/sta_info.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2014-11-09 17:50:09 +0100
committerJohannes Berg <johannes.berg@intel.com>2014-11-19 18:44:35 +0100
commit73c4e195e6396eea04e11f88dc0336e1bc3c8e66 (patch)
tree3e66d96368ba197c30139f07e8b7964e176a4b8c /net/mac80211/sta_info.c
parentmac80211: retransmit TDLS teardown packet through AP if not ACKed (diff)
downloadlinux-73c4e195e6396eea04e11f88dc0336e1bc3c8e66.tar.xz
linux-73c4e195e6396eea04e11f88dc0336e1bc3c8e66.zip
mac80211: move skb info band assignment out
Instead of passing the band as a parameter to ieee80211_xmit() and ieee80211_tx(), move it outside of the two functions while making sure info->band is set up before calling them. This removes the parameter and simplifies the follow commit. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Arik Nemtsov <arik@wizery.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r--net/mac80211/sta_info.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index adc25371b171..97372514f287 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -1249,7 +1249,8 @@ static void ieee80211_send_null_response(struct ieee80211_sub_if_data *sdata,
return;
}
- ieee80211_xmit(sdata, skb, chanctx_conf->def.chan->band);
+ info->band = chanctx_conf->def.chan->band;
+ ieee80211_xmit(sdata, skb);
rcu_read_unlock();
}