Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1d8f44a authored by Nick Kossifidis's avatar Nick Kossifidis Committed by John W. Linville
Browse files

ath5k: Fix radio identification on AR5424/2424 



 *Fix radio chip identification on AR5424/2424 during ath5k_hw_attach
 *Try to assign an RF2413 radio on AR2424 for testing

 Changes-licensed-under: ISC

 Signed-off-by: default avatarNick Kossifidis <mickflemm@gmail.com>

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4503183a

drivers/net/wireless/ath5k/hw.c

+10 −4
Original line number Diff line number Diff line
@@ -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