D55643.id173097.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D55643.id173097.diff
View Options

	diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c
	--- a/sys/net80211/ieee80211_sta.c
	+++ b/sys/net80211/ieee80211_sta.c
	@@ -1011,7 +1011,7 @@
	vap->iv_stats.is_rx_bad_auth++;
	return;
	}
	- if (status != 0) {
	+ if (status != IEEE80211_STATUS_SUCCESS) {
	IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG \| IEEE80211_MSG_AUTH,
	ni, "open auth failed (reason %d)", status);
	vap->iv_stats.is_rx_auth_fail++;
	@@ -1100,7 +1100,7 @@
	IEEE80211_FREE(ni->ni_challenge, M_80211_NODE);
	ni->ni_challenge = NULL;
	}
	- if (status != 0) {
	+ if (status != IEEE80211_STATUS_SUCCESS) {
	IEEE80211_NOTE_FRAME(vap,
	IEEE80211_MSG_DEBUG \| IEEE80211_MSG_AUTH, wh,
	"shared key auth failed (reason %d)", status);
	@@ -1766,7 +1766,12 @@
	frm += 2;
	status = le16toh((uint16_t )frm);
	frm += 2;
	- if (status != 0) {
	+ if (status != IEEE80211_STATUS_SUCCESS) {
	+ /*
	+ * See ieee80211_tx_mgt_cb() for state handling. This
	+ * essentially provokes a timeout bouncing us back to
	+ * State 1 instead of dealing with it properly.
	+ */
	IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC,
	wh->i_addr2, "%sassoc failed (reason %d)",
	ISREASSOC(subtype) ? "re" : "", status);