svn commit: r188496 - in projects/vap7/sys: . contrib/pf dev dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar54...

[Sam Leffler]

Author: sam
Date: Wed Feb 11 18:42:56 2009
New Revision: 188496
URL: http://svn.freebsd.org/changeset/base/188496

Log:
  merge r188494: improve key index map reclaim debug msg

Modified:
  projects/vap7/sys/   (props changed)
  projects/vap7/sys/contrib/pf/   (props changed)
  projects/vap7/sys/dev/   (props changed)
  projects/vap7/sys/dev/ath/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5210/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5211/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5212/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5312/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5416/   (props changed)
  projects/vap7/sys/dev/cxgb/   (props changed)
  projects/vap7/sys/dev/usb2/   (props changed)
  projects/vap7/sys/i386/conf/USB2   (props changed)
  projects/vap7/sys/modules/usb2/   (props changed)
  projects/vap7/sys/net80211/   (props changed)
  projects/vap7/sys/net80211/ieee80211_node.c

Modified: projects/vap7/sys/net80211/ieee80211_node.c
==============================================================================
--- projects/vap7/sys/net80211/ieee80211_node.c	Wed Feb 11 18:41:48 2009	(r188495)
+++ projects/vap7/sys/net80211/ieee80211_node.c	Wed Feb 11 18:42:56 2009	(r188496)
@@ -1719,8 +1719,8 @@ node_reclaim(struct ieee80211_node_table
 	if (nt->nt_keyixmap != NULL && keyix < nt->nt_keyixmax &&
 	    nt->nt_keyixmap[keyix] == ni) {
 		IEEE80211_DPRINTF(ni->ni_vap, IEEE80211_MSG_NODE,
-			"%s: %p<%s> clear key map entry\n",
-			__func__, ni, ether_sprintf(ni->ni_macaddr));
+			"%s: %p<%s> clear key map entry %u\n",
+			__func__, ni, ether_sprintf(ni->ni_macaddr), keyix);
 		nt->nt_keyixmap[keyix] = NULL;
 		ieee80211_node_decref(ni);	/* NB: don't need free */
 	}
@@ -1763,8 +1763,7 @@ ieee80211_node_reclaim(struct ieee80211_
 		 */
 		_ieee80211_free_node(ni);
 		nt = NULL;
-	} else if (ieee80211_node_refcnt(ni) == 1 &&
-	    nt->nt_keyixmap != NULL) {
+	} else if (ieee80211_node_refcnt(ni) == 1 && nt->nt_keyixmap != NULL) {
 		ieee80211_keyix keyix;
 		/*
 		 * Check for a last reference in the key mapping table.
@@ -1774,8 +1773,8 @@ ieee80211_node_reclaim(struct ieee80211_
 		    nt->nt_keyixmap[keyix] == ni) {
 			IEEE80211_DPRINTF(ni->ni_vap,
 			    IEEE80211_MSG_NODE,
-			    "%s: %p<%s> clear key map entry", __func__,
-			    ni, ether_sprintf(ni->ni_macaddr));
+			    "%s: %p<%s> clear key map entry %u", __func__,
+			    ni, ether_sprintf(ni->ni_macaddr), keyix);
 			nt->nt_keyixmap[keyix] = NULL;
 			ieee80211_node_decref(ni); /* XXX needed? */
 			_ieee80211_free_node(ni);