summaryrefslogtreecommitdiffstats
path: root/net/mac80211/chan.c
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@intel.com>2013-11-11 20:34:54 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-11-25 20:51:58 +0100
commit33787fc4bea0347d78a211d1f38289b73d9ec1a6 (patch)
treea1d5decf608084bafc92038af1811ed8eb4b927b /net/mac80211/chan.c
parentf63f8421d468575ae7bb62cfcf0398613c746975 (diff)
downloadop-kernel-dev-33787fc4bea0347d78a211d1f38289b73d9ec1a6.zip
op-kernel-dev-33787fc4bea0347d78a211d1f38289b73d9ec1a6.tar.gz
mac80211: move csa_chandef to sdata
There is no reason why we should have only one channel switch announcement at a time for a single phy. When support for channel switch with multiple contexts and multiple vifs per context is implemented, we will need the chandef data for each vif. Move the csa_chandef structure to sdata to prepare for this. Reviewed-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Luciano Coelho <luciano.coelho@intel.com> [Fixed compilation with mesh] Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/chan.c')
-rw-r--r--net/mac80211/chan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 03ba6b5..cefee2b 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -411,12 +411,12 @@ int ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata,
}
int ieee80211_vif_change_channel(struct ieee80211_sub_if_data *sdata,
- const struct cfg80211_chan_def *chandef,
u32 *changed)
{
struct ieee80211_local *local = sdata->local;
struct ieee80211_chanctx_conf *conf;
struct ieee80211_chanctx *ctx;
+ const struct cfg80211_chan_def *chandef = &sdata->csa_chandef;
int ret;
u32 chanctx_changed = 0;
OpenPOWER on IntegriCloud