diff --git a/[refs] b/[refs] index 567efb4ffe2c..60558d814038 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc713fb2afa1be7a29f5c1d0b087c35bfbbe2815 +refs/heads/master: 948990251508d8d41f5dd2c9988d415fb8fb49c7 diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.c b/trunk/drivers/net/wireless/ath/ath9k/hw.c index 875faf6894ae..88100cc52fc5 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/hw.c +++ b/trunk/drivers/net/wireless/ath/ath9k/hw.c @@ -996,7 +996,7 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah) slottime = 21; sifstime = 64; } else { - eifs = REG_READ(ah, AR_D_GBL_IFS_EIFS); + eifs = REG_READ(ah, AR_D_GBL_IFS_EIFS)/common->clockrate; reg = REG_READ(ah, AR_USEC); rx_lat = MS(reg, AR_USEC_RX_LAT); tx_lat = MS(reg, AR_USEC_TX_LAT);