PERFORCE change 118971 for review

[Sam Leffler]

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

Change 118971 by sam at sam_ebb on 2007/04/30 05:39:49

	fix building w/o IEEE80211_DEBUG

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_node.c#91 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_power.c#6 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_var.h#55 edit

Differences ...

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

@@ -1194,7 +1194,6 @@
 #define	MATCH_SSID(ni, ssid, ssidlen) \
 	(ni->ni_esslen == ssidlen && memcmp(ni->ni_essid, ssid, ssidlen) == 0)
 	static const u_int8_t zeromac[IEEE80211_ADDR_LEN];
-	struct ieee80211com *ic = nt->nt_ic;
 	struct ieee80211_node *ni;
 	int hash;
 
@@ -1218,7 +1217,7 @@
 	}
 	if (ni != NULL) {
 		ieee80211_ref_node(ni);	/* mark referenced */
-		IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE,
+		IEEE80211_DPRINTF(nt->nt_ic, IEEE80211_MSG_NODE,
 		     REFCNT_LOC, ni, ether_sprintf(ni->ni_macaddr),
 		     ieee80211_node_refcnt(ni));
 	}

==== //depot/projects/wifi/sys/net80211/ieee80211_power.c#6 (text+ko) ====

@@ -119,7 +119,6 @@
 int
 ieee80211_node_saveq_age(struct ieee80211_node *ni)
 {
-	struct ieee80211com *ic = ni->ni_ic;
 	int discard = 0;
 
 	if (IEEE80211_NODE_SAVEQ_QLEN(ni) != 0) {
@@ -128,7 +127,7 @@
 		IEEE80211_NODE_SAVEQ_LOCK(ni);
 		while (IF_POLL(&ni->ni_savedq, m) != NULL &&
 		     M_AGE_GET(m) < IEEE80211_INACT_WAIT) {
-IEEE80211_DPRINTF(ic, IEEE80211_MSG_POWER, "[%s] discard frame, age %u\n", ether_sprintf(ni->ni_macaddr), M_AGE_GET(m));/*XXX*/
+IEEE80211_DPRINTF(ni->ni_ic, IEEE80211_MSG_POWER, "[%s] discard frame, age %u\n", ether_sprintf(ni->ni_macaddr), M_AGE_GET(m));/*XXX*/
 			_IEEE80211_NODE_SAVEQ_DEQUEUE_HEAD(ni, m);
 			m_freem(m);
 			discard++;
@@ -137,7 +136,7 @@
 			M_AGE_SUB(m, IEEE80211_INACT_WAIT);
 		IEEE80211_NODE_SAVEQ_UNLOCK(ni);
 
-		IEEE80211_NOTE(ic, IEEE80211_MSG_POWER, ni,
+		IEEE80211_NOTE(ni->ni_ic, IEEE80211_MSG_POWER, ni,
 		    "discard %u frames for age", discard);
 		IEEE80211_NODE_STAT_ADD(ni, ps_discard, discard);
 	}

==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#55 (text+ko) ====

@@ -513,6 +513,7 @@
 	const char *fmt, ...);
 #else
 #define	IEEE80211_DPRINTF(_ic, _m, _fmt, ...)
+#define	IEEE80211_NOTE(_ic, _m, _ni, _fmt, ...)
 #define	IEEE80211_NOTE_FRAME(_ic, _m, _wh, _fmt, ...)
 #define	IEEE80211_NOTE_MAC(_ic, _m, _mac, _fmt, ...)
 #define	ieee80211_msg_dumppkts(_ic)	0