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

Commit a4ed90d6 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

cfg80211: respect API on orig_flags on channel for beacon hint 



As part of our documented API we always respect the orig_flag
settings on a channel. We forgot to follow this for the beacon
hints.

Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3eb92969

net/wireless/reg.c

+4 −2
Original line number Diff line number Diff line
@@ -1070,12 +1070,14 @@ static void handle_reg_beacon(struct wiphy *wiphy, 
	if (likely(chan->center_freq != reg_beacon->chan.center_freq))

		return;



	if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN) {

	if ((chan->flags & IEEE80211_CHAN_PASSIVE_SCAN) &&

	    !(chan->orig_flags & IEEE80211_CHAN_PASSIVE_SCAN)) {

		chan->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;

		REG_DEBUG_BEACON_FLAG("active scanning");

	}



	if (chan->flags & IEEE80211_CHAN_NO_IBSS) {

	if ((chan->flags & IEEE80211_CHAN_NO_IBSS) &&

	    !(chan->orig_flags & IEEE80211_CHAN_NO_IBSS)) {

		chan->flags &= ~IEEE80211_CHAN_NO_IBSS;

		REG_DEBUG_BEACON_FLAG("beaconing");

	}