diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-23 19:44:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-23 19:44:58 -0700 |
| commit | 6440be177f56e0b52dd81df82b78875d9a07d5f9 (patch) | |
| tree | 52d8f98694a7b1e2bee2595e3d9613f6d75c7385 /drivers/net/wireless/ath5k | |
| parent | 49186b4a083655a4ebf54e94baf0736256b01b47 (diff) | |
| parent | 099714934d80100624829f1e2961b9dccaef3280 (diff) | |
| download | kernel_samsung_smdk4412-6440be177f56e0b52dd81df82b78875d9a07d5f9.zip kernel_samsung_smdk4412-6440be177f56e0b52dd81df82b78875d9a07d5f9.tar.gz kernel_samsung_smdk4412-6440be177f56e0b52dd81df82b78875d9a07d5f9.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath5k')
| -rw-r--r-- | drivers/net/wireless/ath5k/hw.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c index 87e7822..5fb1ae6 100644 --- a/drivers/net/wireless/ath5k/hw.c +++ b/drivers/net/wireless/ath5k/hw.c @@ -304,14 +304,20 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version) ah->ah_radio = AR5K_RF2413; ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5112A; } else if (ah->ah_radio_5ghz_revision < AR5K_SREV_RAD_SC2) { - ah->ah_radio = AR5K_RF5413; + ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5112A; + } else if (ah->ah_radio_5ghz_revision < AR5K_SREV_RAD_5133) { - if (ah->ah_mac_srev <= AR5K_SREV_VER_AR5424 && - ah->ah_mac_srev >= AR5K_SREV_VER_AR2424) + /* AR5424 */ + if (srev >= AR5K_SREV_VER_AR5424) { + ah->ah_radio = AR5K_RF5413; ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5424; - else + /* AR2424 */ + } else { + ah->ah_radio = AR5K_RF2413; /* For testing */ ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5112A; + } + /* * Register returns 0x4 for radio revision * so ath5k_hw_radio_revision doesn't parse the value |