svn commit: r188783 - head/sys/dev/ath

[Sam Leffler]

Author: sam
Date: Thu Feb 19 05:22:40 2009
New Revision: 188783
URL: http://svn.freebsd.org/changeset/base/188783

Log:
  remove private support for IEEE80211_MODE_HALF and IEEE80211_MODE_QUARTER
  now that net80211 has them

Modified:
  head/sys/dev/ath/if_ath.c
  head/sys/dev/ath/if_athvar.h

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Thu Feb 19 05:21:54 2009	(r188782)
+++ head/sys/dev/ath/if_ath.c	Thu Feb 19 05:22:40 2009	(r188783)
@@ -5641,12 +5641,7 @@ ath_chan_change(struct ath_softc *sc, st
 	 * Change channels and update the h/w rate map
 	 * if we're switching; e.g. 11a to 11b/g.
 	 */
-	if (IEEE80211_IS_CHAN_HALF(chan))
-		mode = IEEE80211_MODE_HALF;
-	else if (IEEE80211_IS_CHAN_QUARTER(chan))
-		mode = IEEE80211_MODE_QUARTER;
-	else
-		mode = ieee80211_chan2mode(chan);
+	mode = ieee80211_chan2mode(chan);
 	if (mode != sc->sc_curmode)
 		ath_setcurmode(sc, mode);
 	sc->sc_curchan = chan;

Modified: head/sys/dev/ath/if_athvar.h
==============================================================================
--- head/sys/dev/ath/if_athvar.h	Thu Feb 19 05:21:54 2009	(r188782)
+++ head/sys/dev/ath/if_athvar.h	Thu Feb 19 05:22:40 2009	(r188783)
@@ -259,9 +259,7 @@ struct ath_softc {
 	uint32_t		sc_eerd;	/* regdomain from EEPROM */
 	uint32_t		sc_eecc;	/* country code from EEPROM */
 						/* rate tables */
-#define	IEEE80211_MODE_HALF	(IEEE80211_MODE_MAX+0)
-#define	IEEE80211_MODE_QUARTER	(IEEE80211_MODE_MAX+1)
-	const HAL_RATE_TABLE	*sc_rates[IEEE80211_MODE_MAX+2];
+	const HAL_RATE_TABLE	*sc_rates[IEEE80211_MODE_MAX];
 	const HAL_RATE_TABLE	*sc_currates;	/* current rate table */
 	enum ieee80211_phymode	sc_curmode;	/* current phy mode */
 	HAL_OPMODE		sc_opmode;	/* current operating mode */