ath9k: incorrect noise floor threshold values.

This patch fixes incorrect noise floor threshold values.

Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath9k/calib.c b/drivers/net/wireless/ath9k/calib.c
index 1690759..0e214f7 100644 (file)
--- a/drivers/net/wireless/ath9k/calib.c
+++ b/drivers/net/wireless/ath9k/calib.c
@@ -176,14 +176,14 @@ static bool getNoiseFloorThresh(struct ath_hal *ah,
        case CHANNEL_A_HT20:
        case CHANNEL_A_HT40PLUS:
        case CHANNEL_A_HT40MINUS:
-               *nft = (int16_t)ath9k_hw_get_eeprom(ah, EEP_NFTHRESH_5);
+               *nft = (int8_t)ath9k_hw_get_eeprom(ah, EEP_NFTHRESH_5);
                break;
        case CHANNEL_B:
        case CHANNEL_G:
        case CHANNEL_G_HT20:
        case CHANNEL_G_HT40PLUS:
        case CHANNEL_G_HT40MINUS:
-               *nft = (int16_t)ath9k_hw_get_eeprom(ah, EEP_NFTHRESH_2);
+               *nft = (int8_t)ath9k_hw_get_eeprom(ah, EEP_NFTHRESH_2);
                break;
        default:
                DPRINTF(ah->ah_sc, ATH_DBG_CHANNEL,

diff --git a/drivers/net/wireless/ath9k/eeprom.c b/drivers/net/wireless/ath9k/eeprom.c
index 9b2fdc5..180e541 100644 (file)
--- a/drivers/net/wireless/ath9k/eeprom.c
+++ b/drivers/net/wireless/ath9k/eeprom.c
@@ -1551,9 +1551,9 @@ u32 ath9k_hw_get_eeprom(struct ath_hal *ah,
 
        switch (param) {
        case EEP_NFTHRESH_5:
-               return -pModal[0].noiseFloorThreshCh[0];
+               return pModal[0].noiseFloorThreshCh[0];
        case EEP_NFTHRESH_2:
-               return -pModal[1].noiseFloorThreshCh[0];
+               return pModal[1].noiseFloorThreshCh[0];
        case AR_EEPROM_MAC(0):
                return pBase->macAddr[0] << 8 | pBase->macAddr[1];
        case AR_EEPROM_MAC(1):