From owner-p4-projects@FreeBSD.ORG  Sat Feb  9 00:46:24 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3254616A46B; Sat,  9 Feb 2008 00:46:24 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EB52316A417
	for <perforce@freebsd.org>; Sat,  9 Feb 2008 00:46:23 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D8D0E13C43E
	for <perforce@freebsd.org>; Sat,  9 Feb 2008 00:46:23 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m190kN8s024874
	for <perforce@freebsd.org>; Sat, 9 Feb 2008 00:46:23 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m190kNte024871
	for perforce@freebsd.org; Sat, 9 Feb 2008 00:46:23 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 9 Feb 2008 00:46:23 GMT
Message-Id: <200802090046.m190kNte024871@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 135080 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Feb 2008 00:46:24 -0000

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

Change 135080 by sam@sam_ebb on 2008/02/09 00:46:13

	move debug msg down so it only shows up when an ADDBA request
	actually is to be sent

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ht.c#10 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#10 (text+ko) ====

@@ -1539,11 +1539,6 @@
 	int tid, dialogtoken;
 	static int tokens = 0;	/* XXX */
 
-	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N, ni,
-	    "%s: enable AMPDU on %s, avgpps %d pkts %d",
-	    __func__, ieee80211_wme_acnames[tap->txa_ac],
-	    tap->txa_avgpps, tap->txa_pkts);
-
 	/* XXX locking */
 	if ((tap->txa_flags & IEEE80211_AGGR_SETUP) == 0) {
 		/* do deferred setup of state */
@@ -1564,6 +1559,11 @@
 	/* XXX hack for not doing proper locking */
 	tap->txa_flags &= ~IEEE80211_AGGR_NAK;
 
+	IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N, ni,
+	    "%s: enable AMPDU on %s, avgpps %d pkts %d",
+	    __func__, ieee80211_wme_acnames[tap->txa_ac],
+	    tap->txa_avgpps, tap->txa_pkts);
+
 	dialogtoken = (tokens+1) % 63;		/* XXX */
 
 	tid = WME_AC_TO_TID(tap->txa_ac);