Only retry when current state is AUTH. ASSOCIATION state should be another type of handler.

zxystd · zxystd · commit 37c9cb1d1672 · 2021-04-20T17:11:34.000+08:00
diff --git a/itl80211/openbsd/net80211/ieee80211.c b/itl80211/openbsd/net80211/ieee80211.c
@@ -898,7 +898,7 @@ ieee80211_watchdog(struct _ifnet *ifp)
             if (ni)
                 ni->ni_fails++;
             /* Try more times to join, some drivers will timeout when doing auth/assoc */
-            if (ni && ni->ni_fails < 3) {
+            if (ic->ic_state == IEEE80211_S_AUTH && ni && ni->ni_fails < 3) {
                 ieee80211_node_join_bss(ic, ni);
                 goto done;
             }

Original file line number	Diff line number	Diff line change
`@@ -898,7 +898,7 @@ ieee80211_watchdog(struct _ifnet *ifp)`
`898`	`898`	`if (ni)`
`899`	`899`	`ni->ni_fails++;`
`900`	`900`	`/* Try more times to join, some drivers will timeout when doing auth/assoc */`
`901`		`- if (ni && ni->ni_fails < 3) {`
	`901`	`+ if (ic->ic_state == IEEE80211_S_AUTH && ni && ni->ni_fails < 3) {`
`902`	`902`	`ieee80211_node_join_bss(ic, ni);`
`903`	`903`	`goto done;`
`904`	`904`	`}`