From owner-p4-projects@FreeBSD.ORG  Tue Nov 23 22:45:15 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C3D5F16A4D5; Tue, 23 Nov 2004 22:45:14 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 30BC416A4DA
	for <perforce@freebsd.org>; Tue, 23 Nov 2004 22:45:14 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1C0EB43D1D
	for <perforce@freebsd.org>; Tue, 23 Nov 2004 22:45:14 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iANMjECn078113
	for <perforce@freebsd.org>; Tue, 23 Nov 2004 22:45:14 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iANMjD0m078109
	for perforce@freebsd.org; Tue, 23 Nov 2004 22:45:13 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 23 Nov 2004 22:45:13 GMT
Message-Id: <200411232245.iANMjD0m078109@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>
Subject: PERFORCE change 65736 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 23 Nov 2004 22:45:15 -0000

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

Change 65736 by sam@sam_ebb on 2004/11/23 22:44:34

	wme parameter fixups

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#18 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#18 (text+ko) ====

@@ -1154,9 +1154,9 @@
 	if (ac >= WME_NUM_AC)
 		ac = WME_AC_BE;
 	if (ireq->i_len & IEEE80211_WMEPARAM_BSS)
-		wmep = &wme->wme_bssChanParams.cap_wmeParams[ac];
+		wmep = &wme->wme_wmeBssChanParams.cap_wmeParams[ac];
 	else
-		wmep = &wme->wme_wmeBssChanParams.cap_wmeParams[ac];
+		wmep = &wme->wme_wmeChanParams.cap_wmeParams[ac];
 	switch (ireq->i_type) {
 	case IEEE80211_IOC_WME_CWMIN:		/* WME: CWmin */
 		ireq->i_val = wmep->wmep_logcwmin;
@@ -1171,10 +1171,12 @@
 		ireq->i_val = wmep->wmep_txopLimit;
 		break;
 	case IEEE80211_IOC_WME_ACM:		/* WME: ACM (bss only) */
+		wmep = &wme->wme_wmeBssChanParams.cap_wmeParams[ac];
 		ireq->i_val = wmep->wmep_acm;
 		break;
 	case IEEE80211_IOC_WME_ACKPOLICY:	/* WME: ACK policy (!bss only)*/
-		ireq->i_val = wmep->wmep_noackPolicy;
+		wmep = &wme->wme_wmeChanParams.cap_wmeParams[ac];
+		ireq->i_val = !wmep->wmep_noackPolicy;
 		break;
 	}
 	return 0;
@@ -1769,7 +1771,7 @@
 		break;
 	case IEEE80211_IOC_WME_ACKPOLICY:	/* WME: ACK policy (!bss only)*/
 		wmep->wmep_noackPolicy = chanp->wmep_noackPolicy =
-			(ireq->i_val) != 0;
+			(ireq->i_val) == 0;
 		break;
 	}
 	ieee80211_wme_updateparams(ic);