aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/sta_info.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2014-11-09 11:50:09 -0500
committerJohannes Berg <johannes.berg@intel.com>2014-11-19 12:44:35 -0500
commit73c4e195e6396eea04e11f88dc0336e1bc3c8e66 (patch)
tree3e66d96368ba197c30139f07e8b7964e176a4b8c /net/mac80211/sta_info.c
parent1277b4a9f531e84e26f9e0210c1801b0c0bf81ca (diff)
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,
1249 return; 1249 return;
1250 } 1250 }
1251 1251
1252 ieee80211_xmit(sdata, skb, chanctx_conf->def.chan->band); 1252 info->band = chanctx_conf->def.chan->band;
1253 ieee80211_xmit(sdata, skb);
1253 rcu_read_unlock(); 1254 rcu_read_unlock();
1254} 1255}
1255 1256