diff options
author | David S. Miller <davem@davemloft.net> | 2009-07-30 10:35:45 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-30 10:35:45 -0700 |
commit | a1b97440eec0ea3e53183cde8fe82ff8c1ffb091 (patch) | |
tree | e634dc66b0094cf26281704cce56d5117b0a15f9 /drivers/net/wireless/ath/ath9k/eeprom.c | |
parent | 27fed4175acf81ddd91d9a4ee2fd298981f60295 (diff) | |
parent | 89c3a8aca28e6d57f2ae945d97858a372d624b81 (diff) | |
download | op-kernel-dev-a1b97440eec0ea3e53183cde8fe82ff8c1ffb091.zip op-kernel-dev-a1b97440eec0ea3e53183cde8fe82ff8c1ffb091.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/eeprom.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c index a2fda70..ce0e86c 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom.c +++ b/drivers/net/wireless/ath/ath9k/eeprom.c @@ -460,7 +460,7 @@ static int ath9k_hw_4k_check_eeprom(struct ath_hw *ah) integer = swab32(eep->modalHeader.antCtrlCommon); eep->modalHeader.antCtrlCommon = integer; - for (i = 0; i < AR5416_MAX_CHAINS; i++) { + for (i = 0; i < AR5416_EEP4K_MAX_CHAINS; i++) { integer = swab32(eep->modalHeader.antCtrlChain[i]); eep->modalHeader.antCtrlChain[i] = integer; } @@ -914,7 +914,7 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah, ctlMode, numCtlModes, isHt40CtlMode, (pCtlMode[ctlMode] & EXT_ADDITIVE)); - for (i = 0; (i < AR5416_NUM_CTLS) && + for (i = 0; (i < AR5416_EEP4K_NUM_CTLS) && pEepData->ctlIndex[i]; i++) { DPRINTF(ah->ah_sc, ATH_DBG_EEPROM, " LOOP-Ctlidx %d: cfgCtl 0x%2.2x " |