svn commit: r195518 - projects/mesh11s/sys/net80211

[Sam Leffler]

Author: sam
Date: Thu Jul  9 22:11:33 2009
New Revision: 195518
URL: http://svn.freebsd.org/changeset/base/195518

Log:
  add ageq+hash key; fixup some other formatting to match

Modified:
  projects/mesh11s/sys/net80211/ieee80211_ddb.c

Modified: projects/mesh11s/sys/net80211/ieee80211_ddb.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_ddb.c	Thu Jul  9 22:10:29 2009	(r195517)
+++ projects/mesh11s/sys/net80211/ieee80211_ddb.c	Thu Jul  9 22:11:33 2009	(r195518)
@@ -75,6 +75,7 @@ static void _db_show_roamparams(const ch
 	const struct ieee80211_roamparam *rp);
 static void _db_show_txparams(const char *tag, const void *arg,
 	const struct ieee80211_txparam *tp);
+static void _db_show_ageq(const char *tag, const struct ieee80211_ageq *q);
 static void _db_show_stats(const struct ieee80211_stats *);
 static void _db_show_mesh(const struct ieee80211_mesh_state *);
 
@@ -581,10 +582,13 @@ _db_show_com(const struct ieee80211com *
 	db_printf("\n");
 
 	db_printf("\tmax_keyix %d", ic->ic_max_keyix);
+	db_printf(" hash_key 0x%x", ic->ic_hash_key);
 	db_printf(" wme %p", &ic->ic_wme);
 	if (!showsta)
 		db_printf(" sta %p", &ic->ic_sta);
 	db_printf("\n");
+	db_printf("\tstageq@%p:\n", &ic->ic_stageq);
+	_db_show_ageq("\t", &ic->ic_stageq);
 	if (showsta)
 		_db_show_node_table("\t", &ic->ic_sta);
 
@@ -661,16 +665,16 @@ _db_show_node_table(const char *tag, con
 	int i;
 
 	db_printf("%s%s@%p:\n", tag, nt->nt_name, nt);
-	db_printf("%s  nodelock %p", tag, &nt->nt_nodelock);
+	db_printf("%s nodelock %p", tag, &nt->nt_nodelock);
 	db_printf(" inact_init %d", nt->nt_inact_init);
 	db_printf(" scanlock %p", &nt->nt_scanlock);
 	db_printf(" scangen %u\n", nt->nt_scangen);
-	db_printf("%s  keyixmax %d keyixmap %p\n",
+	db_printf("%s keyixmax %d keyixmap %p\n",
 	    tag, nt->nt_keyixmax, nt->nt_keyixmap);
 	for (i = 0; i < nt->nt_keyixmax; i++) {
 		const struct ieee80211_node *ni = nt->nt_keyixmap[i];
 		if (ni != NULL)
-			db_printf("%s  [%3u] %p %s\n", tag, i, ni,
+			db_printf("%s [%3u] %p %s\n", tag, i, ni,
 			    ether_sprintf(ni->ni_macaddr));
 	}
 }
@@ -828,6 +832,20 @@ _db_show_txparams(const char *tag, const
 }
 
 static void
+_db_show_ageq(const char *tag, const struct ieee80211_ageq *q)
+{
+	const struct mbuf *m;
+
+	db_printf("%s lock %p len %d maxlen %d drops %d head %p tail %p\n",
+	    tag, &q->aq_lock, q->aq_len, q->aq_maxlen, q->aq_drops,
+	    q->aq_head, q->aq_tail);
+	for (m = q->aq_head; m != NULL; m = m->m_nextpkt)
+		db_printf("%s %p (len %d, %b)\n", tag, m, m->m_len,
+		    /* XXX could be either TX or RX but is mostly TX */
+		    m->m_flags, IEEE80211_MBUF_TX_FLAG_BITS);
+}
+
+static void
 _db_show_stats(const struct ieee80211_stats *is)
 {
 }