diff options
| author | sam <sam@FreeBSD.org> | 2003-10-17 23:59:11 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2003-10-17 23:59:11 +0000 |
| commit | 68dcd813b1ef06ea01356629c68e765c79b7e227 (patch) | |
| tree | f8dd3d0bbb6e3aa1fbd2cf8d5eeaa8d5a9e02b83 | |
| parent | eefb2fc9e8f438d77d0a751443e37ff4080badea (diff) | |
| download | FreeBSD-src-68dcd813b1ef06ea01356629c68e765c79b7e227.zip FreeBSD-src-68dcd813b1ef06ea01356629c68e765c79b7e227.tar.gz | |
fix station mode breakage (repeat after me: "test every change, no
matter how small...")
| -rw-r--r-- | sys/net80211/ieee80211_input.c | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 6a03c1c..ede1acd 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -835,21 +835,16 @@ ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0, ic->ic_stats.is_rx_auth_unsupported++; return; } - if (ic->ic_state != IEEE80211_S_RUN) { - IEEE80211_DPRINTF(("%s: discard auth from %s; " - "state %u\n", __func__, - ether_sprintf(wh->i_addr2), ic->ic_state)); - ic->ic_stats.is_rx_bad_auth++; - break; - } - if (seq != (ic->ic_opmode == IEEE80211_M_STA ? 2 : 1)) { - IEEE80211_DPRINTF(("%s: discard auth from %s; seq %u\n", - __func__, ether_sprintf(wh->i_addr2), seq)); - ic->ic_stats.is_rx_bad_auth++; - break; - } switch (ic->ic_opmode) { case IEEE80211_M_IBSS: + if (ic->ic_state != IEEE80211_S_RUN || seq != 1) { + IEEE80211_DPRINTF(("%s: discard auth from %s; " + "state %u, seq %u\n", __func__, + ether_sprintf(wh->i_addr2), + ic->ic_state, seq)); + ic->ic_stats.is_rx_bad_auth++; + break; + } ieee80211_new_state(ic, IEEE80211_S_AUTH, wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); break; @@ -859,6 +854,14 @@ ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0, break; case IEEE80211_M_HOSTAP: + if (ic->ic_state != IEEE80211_S_RUN || seq != 1) { + IEEE80211_DPRINTF(("%s: discard auth from %s; " + "state %u, seq %u\n", __func__, + ether_sprintf(wh->i_addr2), + ic->ic_state, seq)); + ic->ic_stats.is_rx_bad_auth++; + break; + } if (ni == ic->ic_bss) { ni = ieee80211_alloc_node(ic, wh->i_addr2); if (ni == NULL) { @@ -881,6 +884,14 @@ ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0, break; case IEEE80211_M_STA: + if (ic->ic_state != IEEE80211_S_AUTH || seq != 2) { + IEEE80211_DPRINTF(("%s: discard auth from %s; " + "state %u, seq %u\n", __func__, + ether_sprintf(wh->i_addr2), + ic->ic_state, seq)); + ic->ic_stats.is_rx_bad_auth++; + break; + } if (status != 0) { if_printf(&ic->ic_if, "authentication failed (reason %d) for %s\n", |
