Commit c12bc488 authored Sep 30, 2014 by Luciano Coelho Committed by Johannes Berg Oct 09, 2014

mac80211: return the vif's chandef in ieee80211_cfg_get_channel()



The chandef of the channel context a vif is using may be different
than the chandef of the vif itself.  For instance, the bandwidth used
by the vif may be narrower than the one configured in the channel
context.  To avoid confusion, return the vif's chandef in
ieee80211_cfg_get_channel() instead of the chandef of the channel
context.

Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 8975ae88

net/mac80211/cfg.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3458,7 +3458,7 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
		rcu_read_lock();
		chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
		if (chanctx_conf) {
		*chandef = chanctx_conf->def;
		*chandef = sdata->vif.bss_conf.chandef;
		ret = 0;
		} else if (local->open_count > 0 &&
		local->open_count == local->monitors &&

Admin message