svn commit: r188791 - 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:47:18 2009
New Revision: 188791
URL: http://svn.freebsd.org/changeset/base/188791

Log:
  merge r188774: don't special case 11na/g legacy rate sets

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.c
  projects/vap7/sys/net80211/ieee80211_ioctl.c

Modified: projects/vap7/sys/net80211/ieee80211.c
==============================================================================
--- projects/vap7/sys/net80211/ieee80211.c	Thu Feb 19 05:46:32 2009	(r188790)
+++ projects/vap7/sys/net80211/ieee80211.c	Thu Feb 19 05:47:18 2009	(r188791)
@@ -185,6 +185,8 @@ ieee80211_chan_init(struct ieee80211com 
 	DEFAULTRATES(IEEE80211_MODE_TURBO_A,	 ieee80211_rateset_11a);
 	DEFAULTRATES(IEEE80211_MODE_TURBO_G,	 ieee80211_rateset_11g);
 	DEFAULTRATES(IEEE80211_MODE_STURBO_A,	 ieee80211_rateset_11a);
+	DEFAULTRATES(IEEE80211_MODE_11NA,	 ieee80211_rateset_11a);
+	DEFAULTRATES(IEEE80211_MODE_11NG,	 ieee80211_rateset_11g);
 
 	/*
 	 * Set auto mode to reset active channel state and any desired channel.
@@ -1011,12 +1013,7 @@ ieee80211_get_suprates(struct ieee80211c
 		return &ieee80211_rateset_half;
 	if (IEEE80211_IS_CHAN_QUARTER(c))
 		return &ieee80211_rateset_quarter;
-	if (IEEE80211_IS_CHAN_HTA(c))
-		return &ic->ic_sup_rates[IEEE80211_MODE_11A];
-	if (IEEE80211_IS_CHAN_HTG(c)) {
-		/* XXX does this work for basic rates? */
-		return &ic->ic_sup_rates[IEEE80211_MODE_11G];
-	}
+	/* XXX does this work for 11ng basic rates? */
 	return &ic->ic_sup_rates[ieee80211_chan2mode(c)];
 }
 

Modified: projects/vap7/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- projects/vap7/sys/net80211/ieee80211_ioctl.c	Thu Feb 19 05:46:32 2009	(r188790)
+++ projects/vap7/sys/net80211/ieee80211_ioctl.c	Thu Feb 19 05:47:18 2009	(r188791)
@@ -2121,8 +2121,7 @@ ieee80211_ioctl_settxparams(struct ieee8
 			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];
+		rs = &ic->ic_sup_rates[i];
 		if (src->ucastrate != dst->ucastrate) {
 			if (!checkmcs(src->ucastrate) &&
 			    !checkrate(rs, src->ucastrate))