From owner-svn-src-projects@FreeBSD.ORG Thu Jul 9 22:11:33 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 95C001065673; Thu, 9 Jul 2009 22:11:33 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6A30F8FC1E; Thu, 9 Jul 2009 22:11:33 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n69MBX7H098651; Thu, 9 Jul 2009 22:11:33 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n69MBXPr098649; Thu, 9 Jul 2009 22:11:33 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200907092211.n69MBXPr098649@svn.freebsd.org> From: Sam Leffler Date: Thu, 9 Jul 2009 22:11:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195518 - projects/mesh11s/sys/net80211 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jul 2009 22:11:33 -0000 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) { }