From owner-p4-projects@FreeBSD.ORG  Wed Sep  3 15:49:02 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C22FC1067B29; Wed,  3 Sep 2008 15:49:01 +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 86A471067B21
	for <perforce@freebsd.org>; Wed,  3 Sep 2008 15:49:01 +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 73F268FC20
	for <perforce@freebsd.org>; Wed,  3 Sep 2008 15:49:01 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m83Fn1Dp001345
	for <perforce@freebsd.org>; Wed, 3 Sep 2008 15:49:01 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83Fn1x2001343
	for perforce@freebsd.org; Wed, 3 Sep 2008 15:49:01 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 3 Sep 2008 15:49:01 GMT
Message-Id: <200809031549.m83Fn1x2001343@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 149118 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: Wed, 03 Sep 2008 15:49:02 -0000

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

Change 149118 by sam@sam_ebb on 2008/09/03 15:48:06

	return the negotiated ampdu density only for sta mode; for others
	we use the local configuration

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#62 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#62 (text+ko) ====

@@ -995,7 +995,8 @@
 			ireq->i_val = vap->iv_ampdu_limit;
 		break;
 	case IEEE80211_IOC_AMPDU_DENSITY:
-		if (vap->iv_state == IEEE80211_S_RUN)
+		if (vap->iv_opmode == IEEE80211_M_STA &&
+		    vap->iv_state == IEEE80211_S_RUN)
 			ireq->i_val = MS(vap->iv_bss->ni_htparam,
 			    IEEE80211_HTCAP_MPDUDENSITY);
 		else