PERFORCE change 65736 for review

[Sam Leffler]

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

Change 65736 by sam at 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);