PERFORCE change 87496 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=87496

Change 87496 by sam at sam_ebb on 2005/11/30 03:38:04

	move node-related malloc's to the M_80211_NODE bucket

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#67 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_node.c#69 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#67 (text+ko) ====

@@ -1098,7 +1098,7 @@
 {
 	if (ni->ni_challenge == NULL)
 		MALLOC(ni->ni_challenge, u_int32_t*, IEEE80211_CHALLENGE_LEN,
-		    M_DEVBUF, M_NOWAIT);
+		    M_80211_NODE, M_NOWAIT);
 	if (ni->ni_challenge == NULL) {
 		IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH,
 		    "[%s] shared key challenge alloc failed\n",
@@ -1285,7 +1285,7 @@
 		switch (seq) {
 		case IEEE80211_AUTH_SHARED_PASS:
 			if (ni->ni_challenge != NULL) {
-				FREE(ni->ni_challenge, M_DEVBUF);
+				FREE(ni->ni_challenge, M_80211_NODE);
 				ni->ni_challenge = NULL;
 			}
 			if (status != 0) {
@@ -1886,8 +1886,8 @@
 	 */
 	if (*iep == NULL || (*iep)[1] != ie[1]) {
 		if (*iep != NULL)
-			FREE(*iep, M_DEVBUF);
-		MALLOC(*iep, void*, ielen, M_DEVBUF, M_NOWAIT);
+			FREE(*iep, M_80211_NODE);
+		MALLOC(*iep, void*, ielen, M_80211_NODE, M_NOWAIT);
 	}
 	if (*iep != NULL)
 		memcpy(*iep, ie, ielen);
@@ -2498,7 +2498,7 @@
 		}
 		/* discard challenge after association */
 		if (ni->ni_challenge != NULL) {
-			FREE(ni->ni_challenge, M_DEVBUF);
+			FREE(ni->ni_challenge, M_80211_NODE);
 			ni->ni_challenge = NULL;
 		}
 		/* NB: 802.11 spec says to ignore station's privacy bit */
@@ -2554,7 +2554,7 @@
 			/*
 			 * Flush any state from a previous association.
 			 */
-			FREE(ni->ni_wpa_ie, M_DEVBUF);
+			FREE(ni->ni_wpa_ie, M_80211_NODE);
 			ni->ni_wpa_ie = NULL;
 		}
 		if (wme != NULL) {
@@ -2569,7 +2569,7 @@
 			/*
 			 * Flush any state from a previous association.
 			 */
-			FREE(ni->ni_wme_ie, M_DEVBUF);
+			FREE(ni->ni_wme_ie, M_80211_NODE);
 			ni->ni_wme_ie = NULL;
 			ni->ni_flags &= ~IEEE80211_NODE_QOS;
 		}
@@ -2585,7 +2585,7 @@
 			/*
 			 * Flush any state from a previous association.
 			 */
-			FREE(ni->ni_ath_ie, M_DEVBUF);
+			FREE(ni->ni_ath_ie, M_80211_NODE);
 			ni->ni_ath_ie = NULL;
 			ni->ni_ath_flags = 0;
 		}

==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#69 (text+ko) ====

@@ -110,7 +110,7 @@
 		ic->ic_max_aid = IEEE80211_AID_MAX;
 	MALLOC(ic->ic_aid_bitmap, u_int32_t *,
 		howmany(ic->ic_max_aid, 32) * sizeof(u_int32_t),
-		M_DEVBUF, M_NOWAIT | M_ZERO);
+		M_80211_NODE, M_NOWAIT | M_ZERO);
 	if (ic->ic_aid_bitmap == NULL) {
 		/* XXX no way to recover */
 		printf("%s: no memory for AID bitmap!\n", __func__);
@@ -170,7 +170,7 @@
 	}
 	ieee80211_node_table_cleanup(&ic->ic_sta);
 	if (ic->ic_aid_bitmap != NULL) {
-		FREE(ic->ic_aid_bitmap, M_DEVBUF);
+		FREE(ic->ic_aid_bitmap, M_80211_NODE);
 		ic->ic_aid_bitmap = NULL;
 	}
 }
@@ -664,7 +664,7 @@
 
 	ni->ni_associd = 0;
 	if (ni->ni_challenge != NULL) {
-		FREE(ni->ni_challenge, M_DEVBUF);
+		FREE(ni->ni_challenge, M_80211_NODE);
 		ni->ni_challenge = NULL;
 	}
 	/*
@@ -698,11 +698,11 @@
 
 	ic->ic_node_cleanup(ni);
 	if (ni->ni_wpa_ie != NULL)
-		FREE(ni->ni_wpa_ie, M_DEVBUF);
+		FREE(ni->ni_wpa_ie, M_80211_NODE);
 	if (ni->ni_wme_ie != NULL)
-		FREE(ni->ni_wme_ie, M_DEVBUF);
+		FREE(ni->ni_wme_ie, M_80211_NODE);
 	if (ni->ni_ath_ie != NULL)
-		FREE(ni->ni_ath_ie, M_DEVBUF);
+		FREE(ni->ni_ath_ie, M_80211_NODE);
 	IEEE80211_NODE_SAVEQ_DESTROY(ni);
 	FREE(ni, M_80211_NODE);
 }