Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit feda3027 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: really fix monitor mode channel reporting 



After Felix's patch it was still broken in case you
used more than just a single monitor interface. Fix
it better now.

Reported-by: default avatarSujith Manoharan <sujith@msujith.org>
Tested-by: default avatarSujith Manoharan <sujith@msujith.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent d0ae708d

net/mac80211/cfg.c

+13 −8
Original line number Diff line number Diff line
@@ -3290,14 +3290,19 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy, 
	int ret = -ENODATA;



	rcu_read_lock();

	if (local->use_chanctx) {

	chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);

	if (chanctx_conf) {

		*chandef = chanctx_conf->def;

		ret = 0;

		}

	} else if (local->open_count == local->monitors) {

	} else if (local->open_count > 0 &&

		   local->open_count == local->monitors &&

		   sdata->vif.type == NL80211_IFTYPE_MONITOR) {

		if (local->use_chanctx)

			*chandef = local->monitor_chandef;

		else

			cfg80211_chandef_create(chandef,

						local->_oper_channel,

						local->_oper_channel_type);

		ret = 0;

	}

	rcu_read_unlock();