diff options
| author | sam <sam@FreeBSD.org> | 2009-02-19 05:22:40 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2009-02-19 05:22:40 +0000 |
| commit | e97897ada3f81da8c0057853b08517177095f01a (patch) | |
| tree | cd5261a7303d78d3e3da8c4ca21366c976db92c9 | |
| parent | ac3671600d3f9dfcb9dec1c308b4273cfb9422e8 (diff) | |
| download | FreeBSD-src-e97897ada3f81da8c0057853b08517177095f01a.zip FreeBSD-src-e97897ada3f81da8c0057853b08517177095f01a.tar.gz | |
remove private support for IEEE80211_MODE_HALF and IEEE80211_MODE_QUARTER
now that net80211 has them
| -rw-r--r-- | sys/dev/ath/if_ath.c | 7 | ||||
| -rw-r--r-- | sys/dev/ath/if_athvar.h | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 1577e88..1a30d5e 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -5641,12 +5641,7 @@ ath_chan_change(struct ath_softc *sc, struct ieee80211_channel *chan) * 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; diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h index 4b3325c..6d5a35d 100644 --- a/sys/dev/ath/if_athvar.h +++ b/sys/dev/ath/if_athvar.h @@ -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 */ |
