Ticket #966: 005-state_machine_sta_init-run_fix.diff

madwifi/net80211/ieee80211_proto.c

@@ -1580 +1580 @@
-                        nrunning = nscanning = 0;
-                        TAILQ_FOREACH(tmpvap, &ic->ic_vaps, iv_next) {
-                                if (vap != tmpvap) {
+                                        if (tmpvap->iv_opmode == IEEE80211_M_MONITOR)
+                                                /* skip monitor vaps as their
+                                                 * S_RUN shouldn't have any
+                                                 * influence on modifying state
+                                                 * transition */
+                                                continue;
-                                        if (tmpvap->iv_state == IEEE80211_S_RUN)
-                                                nrunning++;
-                                        else if (tmpvap->iv_state == IEEE80211_S_SCAN ||
@@ -1594 +1594 @@
-                        } else if (!nscanning && nrunning) {
-                                /* when no one is scanning but someone is running, bypass
-                                 * scan and go to run state immediately */
-
+
+
+
+
+
+
+
+
-                        } else if (nscanning && !nrunning) {
-                                /* when someone is scanning and no one is running, set
-                                 * the scan pending flag. Don't go through state machine */