svn commit: r188796 - in projects/vap7/sys: . contrib/pf dev dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar54...

[Sam Leffler]

Author: sam
Date: Thu Feb 19 05:50:15 2009
New Revision: 188796
URL: http://svn.freebsd.org/changeset/base/188796

Log:
  merge r188779: consolidate loops

Modified:
  projects/vap7/sys/   (props changed)
  projects/vap7/sys/contrib/pf/   (props changed)
  projects/vap7/sys/dev/   (props changed)
  projects/vap7/sys/dev/ath/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5210/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5211/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5212/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5312/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5416/   (props changed)
  projects/vap7/sys/dev/cxgb/   (props changed)
  projects/vap7/sys/dev/usb2/   (props changed)
  projects/vap7/sys/i386/conf/USB2   (props changed)
  projects/vap7/sys/modules/usb2/   (props changed)
  projects/vap7/sys/net80211/   (props changed)
  projects/vap7/sys/net80211/ieee80211_proto.c

Modified: projects/vap7/sys/net80211/ieee80211_proto.c
==============================================================================
--- projects/vap7/sys/net80211/ieee80211_proto.c	Thu Feb 19 05:49:31 2009	(r188795)
+++ projects/vap7/sys/net80211/ieee80211_proto.c	Thu Feb 19 05:50:15 2009	(r188796)
@@ -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;