 @@ -1,14 +1,14 @@
-/*	$NetBSD: ieee80211_input.c,v 1.102 2018/01/16 16:04:16 maxv Exp $	*/
+/*	$NetBSD: ieee80211_input.c,v 1.103 2018/01/16 16:09:30 maxv Exp $	*/
 /*
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -27,27 +27,27 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.81 2005/08/10 16:22:29 sam Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.102 2018/01/16 16:04:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.103 2018/01/16 16:09:30 maxv Exp $");
 #endif
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/endian.h>
 #include <sys/kernel.h>
 @@ -2845,40 +2845,91 @@ ieee80211_recv_mgmt_deauth(struct ieee80
 		break;
 	case IEEE80211_M_HOSTAP:
 #ifndef IEEE80211_NO_HOSTAP
 		if (ni != ic->ic_bss)
 			ieee80211_node_leave(ic, ni);
 #endif /* !IEEE80211_NO_HOSTAP */
 		break;
 	default:
 		ic->ic_stats.is_rx_mgtdiscard++;
 		break;
+	}
+}
-/* -------------------------------------------------------------------------- */
+static void
 ieee80211_recv_mgmt_disassoc(struct ieee80211com *ic, struct mbuf *m0,
 void
 ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0,
     struct ieee80211_node *ni, int subtype, int rssi, u_int32_t rstamp)
+{
 	struct ieee80211_frame *wh;
 	u_int8_t *frm, *efrm;
 	IEEE80211_DEBUGVAR(char ebuf[3 * ETHER_ADDR_LEN]);
 	wh = mtod(m0, struct ieee80211_frame *);
 	frm = (u_int8_t *)(wh + 1);
 	efrm = mtod(m0, u_int8_t *) + m0->m_len;
 	u_int16_t reason;
 	if (ic->ic_state != IEEE80211_S_RUN &&
 	    ic->ic_state != IEEE80211_S_ASSOC &&
 	    ic->ic_state != IEEE80211_S_AUTH) {
 		ic->ic_stats.is_rx_mgtdiscard++;
 		return;
+	}
 	/*
 	 * disassoc frame format
 	 *	[2] reason
 	 */
 	IEEE80211_VERIFY_LENGTH(efrm - frm, 2);
 	reason = le16toh(*(u_int16_t *)frm);
 	__USE(reason);
 	ic->ic_stats.is_rx_disassoc++;
 	IEEE80211_NODE_STAT(ni, rx_disassoc);
 	if (!IEEE80211_ADDR_EQ(wh->i_addr1, ic->ic_myaddr)) {
 		/* Not intended for this station. */
 		ic->ic_stats.is_rx_mgtdiscard++;
 		return;
+	}
 	IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC,
 	    "[%s] recv disassociate (reason %d)\n",
 	    ether_snprintf(ebuf, sizeof(ebuf), ni->ni_macaddr), reason);
 	switch (ic->ic_opmode) {
 	case IEEE80211_M_STA:
 		ieee80211_new_state(ic, IEEE80211_S_ASSOC,
 		    wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK);
 		break;
 	case IEEE80211_M_HOSTAP:
 #ifndef IEEE80211_NO_HOSTAP
 		if (ni != ic->ic_bss)
 			ieee80211_node_leave(ic, ni);
 #endif /* !IEEE80211_NO_HOSTAP */
 		break;
 	default:
 		ic->ic_stats.is_rx_mgtdiscard++;
 		break;
+	}
+}
 /* -------------------------------------------------------------------------- */
 void
 ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0,
     struct ieee80211_node *ni, int subtype, int rssi, u_int32_t rstamp)
+{
 	struct ieee80211_frame *wh;
 	wh = mtod(m0, struct ieee80211_frame *);
 	switch (subtype) {
 	case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
 	case IEEE80211_FC0_SUBTYPE_BEACON:
 		ieee80211_recv_mgmt_beacon(ic, m0, ni, subtype, rssi, rstamp);
 		return;
 	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
 		ieee80211_recv_mgmt_probe_req(ic, m0, ni, subtype, rssi, rstamp);
 		return;
 	case IEEE80211_FC0_SUBTYPE_AUTH:
 		ieee80211_recv_mgmt_auth(ic, m0, ni, subtype, rssi, rstamp);
 		return;
 @@ -2887,78 +2938,39 @@ ieee80211_recv_mgmt(struct ieee80211com
 	case IEEE80211_FC0_SUBTYPE_REASSOC_REQ:
 		ieee80211_recv_mgmt_assoc_req(ic, m0, ni, subtype, rssi, rstamp);
 		return;
 	case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
 	case IEEE80211_FC0_SUBTYPE_REASSOC_RESP:
 		ieee80211_recv_mgmt_assoc_resp(ic, m0, ni, subtype, rssi, rstamp);
 		return;
 	case IEEE80211_FC0_SUBTYPE_DEAUTH:
 		ieee80211_recv_mgmt_deauth(ic, m0, ni, subtype, rssi, rstamp);
 		return;
-	case IEEE80211_FC0_SUBTYPE_DISASSOC: {
+	case IEEE80211_FC0_SUBTYPE_DISASSOC:
-		u_int16_t reason;
+		ieee80211_recv_mgmt_disassoc(ic, m0, ni, subtype, rssi, rstamp);
 		return;
 		if (ic->ic_state != IEEE80211_S_RUN &&
 		    ic->ic_state != IEEE80211_S_ASSOC &&
 		    ic->ic_state != IEEE80211_S_AUTH) {
 			ic->ic_stats.is_rx_mgtdiscard++;
 			return;
 		/*
 		 * disassoc frame format
 		 *	[2] reason
 		 */
 		IEEE80211_VERIFY_LENGTH(efrm - frm, 2);
 		reason = le16toh(*(u_int16_t *)frm);
 		__USE(reason);
 		ic->ic_stats.is_rx_disassoc++;
 		IEEE80211_NODE_STAT(ni, rx_disassoc);
 		if (!IEEE80211_ADDR_EQ(wh->i_addr1, ic->ic_myaddr)) {
 			/* Not intended for this station. */
 			ic->ic_stats.is_rx_mgtdiscard++;
 			break;
 		IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC,
 		    "[%s] recv disassociate (reason %d)\n",
 		    ether_snprintf(ebuf, sizeof(ebuf), ni->ni_macaddr), reason);
 		switch (ic->ic_opmode) {
 		case IEEE80211_M_STA:
 			ieee80211_new_state(ic, IEEE80211_S_ASSOC,
 			    wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK);
 			break;
 		case IEEE80211_M_HOSTAP:
 #ifndef IEEE80211_NO_HOSTAP
 			if (ni != ic->ic_bss)
 				ieee80211_node_leave(ic, ni);
 #endif /* !IEEE80211_NO_HOSTAP */
 			break;
 		default:
 			ic->ic_stats.is_rx_mgtdiscard++;
 			break;
 		break;
 	default:
 		IEEE80211_DISCARD(ic, IEEE80211_MSG_ANY,
 		     wh, "mgt", "subtype 0x%x not handled", subtype);
 		ic->ic_stats.is_rx_badsubtype++;
 		break;
+	}
 #undef ISREASSOC
+}
 #undef ISREASSOC
 #undef IEEE80211_VERIFY_LENGTH
 #undef IEEE80211_VERIFY_ELEMENT
 #ifndef IEEE80211_NO_HOSTAP
 /*
  * Handle station power-save state change.
  */
 static void
 ieee80211_node_pwrsave(struct ieee80211_node *ni, int enable)
+{
 	struct ieee80211com *ic = ni->ni_ic;
 	struct mbuf *m;
 	IEEE80211_DEBUGVAR(char ebuf[3 * ETHER_ADDR_LEN]);