PERFORCE change 69336 for review

[Sam Leffler]

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

Change 69336 by sam at sam_ebb on 2005/01/20 01:09:28

	add ni address to node management debug msgs; the mac address
	is insufficient for debugging the really tough problems

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_node.c#42 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_output.c#34 edit

Differences ...

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

@@ -883,7 +883,7 @@
 	int hash;
 
 	IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE,
-		"%s %s in %s table\n", __func__,
+		"%s %p<%s> in %s table\n", __func__, ni,
 		ether_sprintf(macaddr), nt->nt_name);
 
 	IEEE80211_ADDR_COPY(ni->ni_macaddr, macaddr);
@@ -962,9 +962,10 @@
 			ieee80211_ref_node(ni);	/* mark referenced */
 #ifdef IEEE80211_DEBUG_REFCNT
 			IEEE80211_DPRINTF(nt->nt_ic, IEEE80211_MSG_NODE,
-			    "%s (%s:%u) %s refcnt %d\n", __func__, func, line,
-			     ether_sprintf(ni->ni_macaddr),
-			     ieee80211_node_refcnt(ni));
+			    "%s (%s:%u) %p<%s> refcnt %d\n", __func__,
+			    func, line,
+			    ni, ether_sprintf(ni->ni_macaddr),
+			    ieee80211_node_refcnt(ni));
 #endif
 			return ni;
 		}
@@ -1129,12 +1130,13 @@
 			ieee80211_ref_node(ni);		/* mark referenced */
 			IEEE80211_DPRINTF(nt->nt_ic, IEEE80211_MSG_NODE,
 #ifdef IEEE80211_DEBUG_REFCNT
-			    "%s (%s:%u) %s refcnt %d\n", __func__, func, line,
+			    "%s (%s:%u) %p<%s> refcnt %d\n", __func__,
+			    func, line,
 #else
-			    "%s %s refcnt %d\n", __func__,
+			    "%s %p<%s> refcnt %d\n", __func__,
 #endif
-			     ether_sprintf(ni->ni_macaddr),
-			     ieee80211_node_refcnt(ni));
+			    ni, ether_sprintf(ni->ni_macaddr),
+			    ieee80211_node_refcnt(ni));
 			break;
 		}
 	}
@@ -1168,11 +1170,12 @@
 			ieee80211_ref_node(ni);		/* mark referenced */
 			IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE,
 #ifdef IEEE80211_DEBUG_REFCNT
-			    "%s (%s:%u) %s refcnt %d\n", __func__, func, line,
+			    "%s (%s:%u) %p<%s> refcnt %d\n", __func__,
+			    func, line,
 #else
-			    "%s %s refcnt %d\n", __func__,
+			    "%s %p<%s> refcnt %d\n", __func__,
 #endif
-			     ether_sprintf(ni->ni_macaddr),
+			     ni, ether_sprintf(ni->ni_macaddr),
 			     ieee80211_node_refcnt(ni));
 			break;
 		}
@@ -1188,7 +1191,8 @@
 	struct ieee80211_node_table *nt = ni->ni_table;
 
 	IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE,
-		"%s %s in %s table\n", __func__, ether_sprintf(ni->ni_macaddr),
+		"%s %p<%s> in %s table\n", __func__, ni,
+		ether_sprintf(ni->ni_macaddr),
 		nt != NULL ? nt->nt_name : "<gone>");
 
 	IEEE80211_AID_CLR(ni->ni_associd, ic->ic_aid_bitmap);
@@ -1210,7 +1214,7 @@
 
 #ifdef IEEE80211_DEBUG_REFCNT
 	IEEE80211_DPRINTF(ni->ni_ic, IEEE80211_MSG_NODE,
-		"%s (%s:%u) %s refcnt %d\n", __func__, func, line,
+		"%s (%s:%u) %p<%s> refcnt %d\n", __func__, func, line, ni,
 		 ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)-1);
 #endif
 	if (ieee80211_node_dectestref(ni)) {
@@ -1238,6 +1242,10 @@
 node_reclaim(struct ieee80211_node_table *nt, struct ieee80211_node *ni)
 {
 
+	IEEE80211_DPRINTF(ni->ni_ic, IEEE80211_MSG_NODE,
+		"%s: remove %p<%s> from %s table, refcnt %d\n",
+		__func__, ni, ether_sprintf(ni->ni_macaddr),
+		nt->nt_name, ieee80211_node_refcnt(ni)-1);
 	if (!ieee80211_node_dectestref(ni)) {
 		/*
 		 * Other references are present, just remove the

==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#34 (text+ko) ====

@@ -1142,9 +1142,9 @@
 	 * will remove our reference.
 	 */
 	IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE,
-		"ieee80211_ref_node (%s:%u) %s refcnt %d\n",
+		"ieee80211_ref_node (%s:%u) %p<%s> refcnt %d\n",
 		__func__, __LINE__,
-		ether_sprintf(ni->ni_macaddr),
+		ni, ether_sprintf(ni->ni_macaddr),
 		ieee80211_node_refcnt(ni)+1);
 	ieee80211_ref_node(ni);