From owner-p4-projects@FreeBSD.ORG  Sat Jan 12 23:49:50 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3AA5916A421; Sat, 12 Jan 2008 23:49:48 +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 BDCD416A41B
	for <perforce@freebsd.org>; Sat, 12 Jan 2008 23:49:47 +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 8567A13C447
	for <perforce@freebsd.org>; Sat, 12 Jan 2008 23:49:47 +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 m0CNnla6050834
	for <perforce@freebsd.org>; Sat, 12 Jan 2008 23:49:47 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0CNnlCD050831
	for perforce@freebsd.org; Sat, 12 Jan 2008 23:49:47 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 12 Jan 2008 23:49:47 GMT
Message-Id: <200801122349.m0CNnlCD050831@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 133140 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, 12 Jan 2008 23:49:50 -0000

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

Change 133140 by sam@sam_ebb on 2008/01/12 23:49:20

	11n fixed rates can be either mcs or legacy

Affected files ...

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

Differences ...

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

@@ -2030,6 +2030,7 @@
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_txparams_req parms;	/* XXX stack use? */
 	struct ieee80211_txparam *src, *dst;
+	const struct ieee80211_rateset *rs;
 	int error, i, changed;
 
 	if (ireq->i_len != sizeof(parms))
@@ -2044,18 +2045,19 @@
 			continue;
 		src = &parms.params[i];
 		dst = &vap->iv_txparms[i];
+		rs = &ic->ic_sup_rates[i];
 		if (src->ucastrate != dst->ucastrate) {
-			if (!checkrate(&ic->ic_sup_rates[i], src->ucastrate))
+			if (!checkrate(rs, src->ucastrate))
 				return EINVAL;
 			changed++;
 		}
 		if (src->mcastrate != dst->mcastrate) {
-			if (!checkrate(&ic->ic_sup_rates[i], src->mcastrate))
+			if (!checkrate(rs, src->mcastrate))
 				return EINVAL;
 			changed++;
 		}
 		if (src->mgmtrate != dst->mgmtrate) {
-			if (!checkrate(&ic->ic_sup_rates[i], src->mgmtrate))
+			if (!checkrate(rs, src->mgmtrate))
 				return EINVAL;
 			changed++;
 		}
@@ -2068,18 +2070,23 @@
 			continue;
 		src = &parms.params[i];
 		dst = &vap->iv_txparms[i];
+		rs = &ic->ic_sup_rates[i == IEEE80211_MODE_11NA ?
+		    IEEE80211_MODE_11A : IEEE80211_MODE_11G];
 		if (src->ucastrate != dst->ucastrate) {
-			if (!checkmcs(src->ucastrate))
+			if (!checkmcs(src->ucastrate) &&
+			    !checkrate(rs, src->ucastrate))
 				return EINVAL;
 			changed++;
 		}
 		if (src->mcastrate != dst->mcastrate) {
-			if (!checkmcs(src->mcastrate))
+			if (!checkmcs(src->mcastrate) &&
+			    !checkrate(rs, src->mcastrate))
 				return EINVAL;
 			changed++;
 		}
 		if (src->mgmtrate != dst->mgmtrate) {
-			if (!checkmcs(src->mgmtrate))
+			if (!checkmcs(src->mgmtrate) &&
+			    !checkrate(rs, src->mgmtrate))
 				return EINVAL;
 			changed++;
 		}