mac80211: unset SDATA_STATE_OFFCHANNEL when cancelling a scan
PATCH 1/1 mac80211: unset SDATA_STATE_OFFCHANNEL when cancelling a scan
For client STA interfaces, ieee80211_do_stop unsets the relevant interface's SDATA_STATE_RUNNING state bit prior to cancelling an interrupted scan. When ieee80211_offchannel_return is invoked as part of cancelling the scan, it doesn't bother unsetting the SDATA_STATE_OFFCHANNEL bit because it sees that the interface is down. Normally this doesn't matter because when the client STA interface is brought back up, it will probably issue a scan. But in some cases (e.g., the user changes the interface type while it is down), the SDATA_STATE_OFFCHANNEL bit will remain set. This prevents the interface queues from being started. So we unconditionally unset this bit when we cancel a scan.
--- net/mac80211/offchannel.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
net/mac80211/offchannel.c +3 -1
@@ -156,8 +156,10 @@ void ieee80211_offchannel_return(struct ieee80211_local *local,mutex_lock (&local->iflist_mtx);list_for_each_entry (sdata, &local->interfaces, list) { -if (!ieee80211_sdata_running (sdata)) +if (!ieee80211_sdata_running (sdata)) { +clear_bit (SDATA_STATE_OFFCHANNEL , &sdata->state);continue ; + }/* Tell AP we're back */ if (sdata->vif.type ==NL80211_IFTYPE_STATION ) {
Signature · 1 line
1.7.1.1
Johannes Berg
maintainerQuoted 3 lines · Brian Cavagnolo
For client STA interfaces,
ieee80211_do_stopunsets the relevant interface'sSDATA_STATE_RUNNINGstate bit prior to cancelling an interrupted scan.
Would it not make more sense to fix that code to do it in a working order?
johannes
PATCH 1/1 mac80211: unset SDATA_STATE_OFFCHANNEL when cancelling a scan
For client STA interfaces, ieee80211_do_stop unsets the relevant interface's SDATA_STATE_RUNNING state bit prior to cancelling an interrupted scan. When ieee80211_offchannel_return is invoked as part of cancelling the scan, it doesn't bother unsetting the SDATA_STATE_OFFCHANNEL bit because it sees that the interface is down. Normally this doesn't matter because when the client STA interface is brought back up, it will probably issue a scan. But in some cases (e.g., the user changes the interface type while it is down), the SDATA_STATE_OFFCHANNEL bit will remain set. This prevents the interface queues from being started. So we cancel the scan before unsetting the SDATA_STATE_RUNNING bit.
--- net/mac80211/iface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
net/mac80211/iface.c +3 -3
@@ -391,6 +391,9 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,u32 hw_reconf_flags =0 ;int i; +if (local->scan_sdata == sdata) +ieee80211_scan_cancel (local); +clear_bit (SDATA_STATE_RUNNING , &sdata->state);/*
@@ -523,9 +526,6 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,synchronize_rcu ();skb_queue_purge (&sdata->skb_queue); -if (local->scan_sdata == sdata) -ieee80211_scan_cancel (local); -/* * Disable beaconing here for mesh only, AP and IBSS * are already taken care of.
Signature · 1 line
1.7.1.1