mac80211: fix driver offchannel notification when the channel does not change
PATCH 1/1 mac80211: fix driver offchannel notification when the channel does not change
When running in client mode and associating to an AP, the channel change is usually performed with the offchannel flag still set. However after the assoc is complete, the following channel change event is suppressed because the run time channel is already set to the operating channel. Fix this by sending channel change notifications to the driver even if only the offchannel flag changes.
Signed-off-by Felix Fietkau <[email protected]>
---
net/mac80211/main.c +4 -1
@@ -103,11 +103,13 @@ int ieee80211_hw_config(struct ieee80211int ret =0 ;int power;enum nl80211_channel_type channel_type; +u32 offchannel_flag;might_sleep (); scan_chan = local->scan_channel; + offchannel_flag = local->hw.conf.flags &IEEE80211_CONF_OFFCHANNEL ;if (scan_chan) { chan = scan_chan; channel_type =NL80211_CHAN_NO_HT ;
@@ -121,8 +123,9 @@ int ieee80211_hw_config(struct ieee80211 channel_type = local->_oper_channel_type; local->hw.conf.flags &= ~IEEE80211_CONF_OFFCHANNEL ; } + offchannel_flag ^= local->hw.conf.flags &IEEE80211_CONF_OFFCHANNEL ; -if (chan != local->hw.conf.channel || +if (offchannel_flag || chan != local->hw.conf.channel || channel_type != local->hw.conf.channel_type) { local->hw.conf.channel = chan; local->hw.conf.channel_type = channel_type;