aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ath/ath5k/base.c2
-rw-r--r--drivers/net/wireless/ath/ath5k/reg.h13
2 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 21d10dc34011..1b48ed87ca2f 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -1977,7 +1977,7 @@ ath5k_beacon_update_timers(struct ath5k_softc *sc, u64 bc_tsf)
1977 hw_tsf = ath5k_hw_get_tsf64(ah); 1977 hw_tsf = ath5k_hw_get_tsf64(ah);
1978 hw_tu = TSF_TO_TU(hw_tsf); 1978 hw_tu = TSF_TO_TU(hw_tsf);
1979 1979
1980#define FUDGE AR5K_TUNE_SW_BEACON_RESP + 3 1980#define FUDGE (AR5K_TUNE_SW_BEACON_RESP + 3)
1981 /* We use FUDGE to make sure the next TBTT is ahead of the current TU. 1981 /* We use FUDGE to make sure the next TBTT is ahead of the current TU.
1982 * Since we later subtract AR5K_TUNE_SW_BEACON_RESP (10) in the timer 1982 * Since we later subtract AR5K_TUNE_SW_BEACON_RESP (10) in the timer
1983 * configuration we need to make sure it is bigger than that. */ 1983 * configuration we need to make sure it is bigger than that. */
diff --git a/drivers/net/wireless/ath/ath5k/reg.h b/drivers/net/wireless/ath/ath5k/reg.h
index 060a4c522ab2..994d29ace34d 100644
--- a/drivers/net/wireless/ath/ath5k/reg.h
+++ b/drivers/net/wireless/ath/ath5k/reg.h
@@ -2259,12 +2259,13 @@
2259#define AR5K_PHY_FRAME_CTL_ILLLEN_ERR 0x08000000 /* Illegal length */ 2259#define AR5K_PHY_FRAME_CTL_ILLLEN_ERR 0x08000000 /* Illegal length */
2260#define AR5K_PHY_FRAME_CTL_SERVICE_ERR 0x20000000 2260#define AR5K_PHY_FRAME_CTL_SERVICE_ERR 0x20000000
2261#define AR5K_PHY_FRAME_CTL_TXURN_ERR 0x40000000 /* TX underrun */ 2261#define AR5K_PHY_FRAME_CTL_TXURN_ERR 0x40000000 /* TX underrun */
2262#define AR5K_PHY_FRAME_CTL_INI AR5K_PHY_FRAME_CTL_SERVICE_ERR | \ 2262#define AR5K_PHY_FRAME_CTL_INI \
2263 AR5K_PHY_FRAME_CTL_TXURN_ERR | \ 2263 (AR5K_PHY_FRAME_CTL_SERVICE_ERR | \
2264 AR5K_PHY_FRAME_CTL_ILLLEN_ERR | \ 2264 AR5K_PHY_FRAME_CTL_TXURN_ERR | \
2265 AR5K_PHY_FRAME_CTL_ILLRATE_ERR | \ 2265 AR5K_PHY_FRAME_CTL_ILLLEN_ERR | \
2266 AR5K_PHY_FRAME_CTL_PARITY_ERR | \ 2266 AR5K_PHY_FRAME_CTL_ILLRATE_ERR | \
2267 AR5K_PHY_FRAME_CTL_TIMING_ERR 2267 AR5K_PHY_FRAME_CTL_PARITY_ERR | \
2268 AR5K_PHY_FRAME_CTL_TIMING_ERR)
2268 2269
2269/* 2270/*
2270 * PHY Tx Power adjustment register [5212A+] 2271 * PHY Tx Power adjustment register [5212A+]