diff options
| -rw-r--r-- | sys/dev/ic/ar5416.c | 7 | ||||
| -rw-r--r-- | sys/dev/ic/ar9285.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/ar9287.c | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/sys/dev/ic/ar5416.c b/sys/dev/ic/ar5416.c index f808236f5a7..0a52e669194 100644 --- a/sys/dev/ic/ar5416.c +++ b/sys/dev/ic/ar5416.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5416.c,v 1.1 2009/11/14 16:55:11 damien Exp $ */ +/* $OpenBSD: ar5416.c,v 1.2 2009/11/14 20:18:25 deraadt Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -509,10 +509,13 @@ ar5416_set_txpower(struct athn_softc *sc, struct ieee80211_channel *c, const struct ar5416_eeprom *eep = sc->eep; const struct ar5416_modal_eep_header *modal; uint8_t tpow_cck[4], tpow_ofdm[4]; +#ifndef IEEE80211_NO_HT uint8_t tpow_cck_ext[4], tpow_ofdm_ext[4]; uint8_t tpow_ht20[8], tpow_ht40[8]; + uint8_t ht40inc; +#endif int16_t pwr, pwroff, max_ant_gain, power[ATHN_POWER_COUNT]; - uint8_t cckinc, ht40inc; + uint8_t cckinc; int i; ar5416_set_power_calib(sc, c); diff --git a/sys/dev/ic/ar9285.c b/sys/dev/ic/ar9285.c index 02d678f40bd..ea32614691d 100644 --- a/sys/dev/ic/ar9285.c +++ b/sys/dev/ic/ar9285.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar9285.c,v 1.1 2009/11/14 16:55:11 damien Exp $ */ +/* $OpenBSD: ar9285.c,v 1.2 2009/11/14 20:18:25 deraadt Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -591,10 +591,12 @@ ar9285_set_txpower(struct athn_softc *sc, struct ieee80211_channel *c, const struct ar9285_eeprom *eep = sc->eep; const struct ar9285_modal_eep_header *modal = &eep->modalHeader; uint8_t tpow_cck[4], tpow_ofdm[4]; +#ifndef IEEE80211_NO_HT uint8_t tpow_cck_ext[4], tpow_ofdm_ext[4]; uint8_t tpow_ht20[8], tpow_ht40[8]; - int16_t max_ant_gain, power[ATHN_POWER_COUNT]; uint8_t ht40inc; +#endif + int16_t max_ant_gain, power[ATHN_POWER_COUNT]; int i; ar9285_set_power_calib(sc, c); diff --git a/sys/dev/ic/ar9287.c b/sys/dev/ic/ar9287.c index 7a472f97fc8..e9dde7745f9 100644 --- a/sys/dev/ic/ar9287.c +++ b/sys/dev/ic/ar9287.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar9287.c,v 1.1 2009/11/14 16:55:11 damien Exp $ */ +/* $OpenBSD: ar9287.c,v 1.2 2009/11/14 20:18:25 deraadt Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -426,10 +426,12 @@ ar9287_set_txpower(struct athn_softc *sc, struct ieee80211_channel *c, const struct ar9287_eeprom *eep = sc->eep; const struct ar9287_modal_eep_header *modal = &eep->modalHeader; uint8_t tpow_cck[4], tpow_ofdm[4]; +#ifndef IEEE80211_NO_HT uint8_t tpow_cck_ext[4], tpow_ofdm_ext[4]; uint8_t tpow_ht20[8], tpow_ht40[8]; - int16_t pwr, max_ant_gain, power[ATHN_POWER_COUNT]; uint8_t ht40inc; +#endif + int16_t pwr, max_ant_gain, power[ATHN_POWER_COUNT]; int i; /* Compute transmit power reduction due to antenna gain. */ |