diff options
Diffstat (limited to 'drivers/net/wireless/ath5k/hw.c')
-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 87e782291a01..5fb1ae6ad3e2 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) | |||
304 | ah->ah_radio = AR5K_RF2413; | 304 | ah->ah_radio = AR5K_RF2413; |
305 | ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5112A; | 305 | ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5112A; |
306 | } else if (ah->ah_radio_5ghz_revision < AR5K_SREV_RAD_SC2) { | 306 | } else if (ah->ah_radio_5ghz_revision < AR5K_SREV_RAD_SC2) { |
307 | |||
308 | ah->ah_radio = AR5K_RF5413; | 307 | ah->ah_radio = AR5K_RF5413; |
308 | ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5112A; | ||
309 | } else if (ah->ah_radio_5ghz_revision < AR5K_SREV_RAD_5133) { | ||
309 | 310 | ||
310 | if (ah->ah_mac_srev <= AR5K_SREV_VER_AR5424 && | 311 | /* AR5424 */ |
311 | ah->ah_mac_srev >= AR5K_SREV_VER_AR2424) | 312 | if (srev >= AR5K_SREV_VER_AR5424) { |
313 | ah->ah_radio = AR5K_RF5413; | ||
312 | ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5424; | 314 | ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5424; |
313 | else | 315 | /* AR2424 */ |
316 | } else { | ||
317 | ah->ah_radio = AR5K_RF2413; /* For testing */ | ||
314 | ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5112A; | 318 | ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5112A; |
319 | } | ||
320 | |||
315 | /* | 321 | /* |
316 | * Register returns 0x4 for radio revision | 322 | * Register returns 0x4 for radio revision |
317 | * so ath5k_hw_radio_revision doesn't parse the value | 323 | * so ath5k_hw_radio_revision doesn't parse the value |