Skip to contentSkip to conversation

mac80211: fix an oops in ieee80211_scan_state_set_channel

PATCH In review Helmut Schaa 2 participants 2 messages Jul 25, 2009 mac80211

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mac80211: fix an oops in ieee80211_scan_state_set_channel

Fix an oops in ieee80211_scan_state_set_channel which was triggered if the last scanned channel was skipped (for example due to regulatory restrictions) by returning to the decision state after each skipped channel.

---

net/mac80211/scan.c +4 -1
index b376775..147772a 100644
@@ -605,8 +605,11 @@ static void ieee80211_scan_state_set_channel(struct ieee80211_local *local,
        /* advance state machine to next channel/band */
        local->scan_channel_idx++;
 
-       if (skip)
+       if (skip) {
+               /* if we skip this channel return to the decision state */
+               local->next_scan_state = SCAN_DECISION;
                return;
+       }
 
        /*
         * Probe delay is used to update the NAV, cf. 11.1.3.2.2
#1 lore raw
Quoted 7 lines · Helmut Schaa

Fix an oops in ieee80211_scan_state_set_channel which was triggered if the last scanned channel was skipped (for example due to regulatory restrictions) by returning to the decision state after each skipped channel.

---

Better late than never, but this patch does fix the problem for me.

Larry