summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2013-04-19 06:59:10 +0000
committeradrian <adrian@FreeBSD.org>2013-04-19 06:59:10 +0000
commit420de95094a4e8e0da9c8e21fb4a4ed78c49bf04 (patch)
tree69f65ff52edd746b1e543d0062a62cd44e8c5c50
parent4a3cd971e24fa2e55dcb27f00fda182526196fdd (diff)
downloadFreeBSD-src-420de95094a4e8e0da9c8e21fb4a4ed78c49bf04.zip
FreeBSD-src-420de95094a4e8e0da9c8e21fb4a4ed78c49bf04.tar.gz
Use uint32_t for fields that are fetched via ath_hal_getcapability().
-rw-r--r--sys/dev/ath/if_ath.c2
-rw-r--r--sys/dev/ath/if_athvar.h10
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index 85e2b4e..2ff1d1c 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -739,7 +739,7 @@ ath_attach(u_int16_t devid, struct ath_softc *sc)
*/
if (ath_hal_getcapability(ah, HAL_CAP_HT, 0, NULL) == HAL_OK &&
(wmodes & (HAL_MODE_HT20 | HAL_MODE_HT40))) {
- int rxs, txs;
+ uint32_t rxs, txs;
device_printf(sc->sc_dev, "[HT] enabling HT modes\n");
diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h
index 703bb53..b202c06 100644
--- a/sys/dev/ath/if_athvar.h
+++ b/sys/dev/ath/if_athvar.h
@@ -772,11 +772,11 @@ struct ath_softc {
u_int32_t sc_avgtsfdeltap;/* TDMA slot adjust (+) */
u_int32_t sc_avgtsfdeltam;/* TDMA slot adjust (-) */
uint16_t *sc_eepromdata; /* Local eeprom data, if AR9100 */
- int sc_txchainmask; /* hardware TX chainmask */
- int sc_rxchainmask; /* hardware RX chainmask */
- int sc_cur_txchainmask; /* currently configured TX chainmask */
- int sc_cur_rxchainmask; /* currently configured RX chainmask */
- int sc_rts_aggr_limit; /* TX limit on RTS aggregates */
+ uint32_t sc_txchainmask; /* hardware TX chainmask */
+ uint32_t sc_rxchainmask; /* hardware RX chainmask */
+ uint32_t sc_cur_txchainmask; /* currently configured TX chainmask */
+ uint32_t sc_cur_rxchainmask; /* currently configured RX chainmask */
+ uint32_t sc_rts_aggr_limit; /* TX limit on RTS aggregates */
int sc_aggr_limit; /* TX limit on all aggregates */
int sc_delim_min_pad; /* Minimum delimiter count */
OpenPOWER on IntegriCloud