Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 19 Feb 2009 04:46:09 +0000 (UTC)
From:      Sam Leffler <sam@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r188779 - head/sys/net80211
Message-ID:  <200902190446.n1J4k9lB084540@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: sam
Date: Thu Feb 19 04:46:09 2009
New Revision: 188779
URL: http://svn.freebsd.org/changeset/base/188779

Log:
  o consolidate loops to eliminate assumptions about ordering of modes
  o replace 0x80 by IEEE80211_RATE_MCS

Modified:
  head/sys/net80211/ieee80211_proto.c

Modified: head/sys/net80211/ieee80211_proto.c
==============================================================================
--- head/sys/net80211/ieee80211_proto.c	Thu Feb 19 04:44:18 2009	(r188778)
+++ head/sys/net80211/ieee80211_proto.c	Thu Feb 19 04:46:09 2009	(r188779)
@@ -182,22 +182,19 @@ ieee80211_proto_vattach(struct ieee80211
 	 * max retry count.  These settings can be changed by the
 	 * driver and/or user applications.
 	 */
-	for (i = IEEE80211_MODE_11A; i < IEEE80211_MODE_11NA; i++) {
+	for (i = IEEE80211_MODE_11A; i < IEEE80211_MODE_MAX; i++) {
 		const struct ieee80211_rateset *rs = &ic->ic_sup_rates[i];
 
 		vap->iv_txparms[i].ucastrate = IEEE80211_FIXED_RATE_NONE;
-		/* NB: we default to min supported rate for channel */
-		vap->iv_txparms[i].mgmtrate =
-		    rs->rs_rates[0] & IEEE80211_RATE_VAL;
-		vap->iv_txparms[i].mcastrate = 
-		    rs->rs_rates[0] & IEEE80211_RATE_VAL;
-		vap->iv_txparms[i].maxretry = IEEE80211_TXMAX_DEFAULT;
-	}
-	for (; i < IEEE80211_MODE_MAX; i++) {
-		vap->iv_txparms[i].ucastrate = IEEE80211_FIXED_RATE_NONE;
-		/* NB: default to MCS 0 */
-		vap->iv_txparms[i].mgmtrate = 0 | 0x80;
-		vap->iv_txparms[i].mcastrate = 0 | 0x80;
+		if (i == IEEE80211_MODE_11NA || i == IEEE80211_MODE_11NG) {
+			vap->iv_txparms[i].mgmtrate = 0 | IEEE80211_RATE_MCS;
+			vap->iv_txparms[i].mcastrate = 0 | IEEE80211_RATE_MCS;
+		} else {
+			vap->iv_txparms[i].mgmtrate =
+			    rs->rs_rates[0] & IEEE80211_RATE_VAL;
+			vap->iv_txparms[i].mcastrate = 
+			    rs->rs_rates[0] & IEEE80211_RATE_VAL;
+		}
 		vap->iv_txparms[i].maxretry = IEEE80211_TXMAX_DEFAULT;
 	}
 	vap->iv_roaming = IEEE80211_ROAMING_AUTO;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902190446.n1J4k9lB084540>