From e09956a5f9b93d5ba14772a984fd8e98b6c2a943 Mon Sep 17 00:00:00 2001 From: Wojciech Dubowik Date: Fri, 18 Feb 2011 13:06:42 +0100 Subject: [PATCH] --- yaml --- r: 237433 b: refs/heads/master c: d985255e00e8a6a0d87b1dc674113bc76bed04a0 h: refs/heads/master i: 237431: 704a722b5926f2056c31b27e9c813f0e79ab8dfb v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath5k/attach.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 723308bef94d..d45938216586 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f456228365bf3615bc6837c363653f31df66abff +refs/heads/master: d985255e00e8a6a0d87b1dc674113bc76bed04a0 diff --git a/trunk/drivers/net/wireless/ath/ath5k/attach.c b/trunk/drivers/net/wireless/ath/ath5k/attach.c index c71fdbb4c439..bc8240560488 100644 --- a/trunk/drivers/net/wireless/ath/ath5k/attach.c +++ b/trunk/drivers/net/wireless/ath/ath5k/attach.c @@ -220,7 +220,8 @@ int ath5k_hw_init(struct ath5k_softc *sc) ah->ah_radio = AR5K_RF5112; ah->ah_single_chip = false; ah->ah_radio_5ghz_revision = AR5K_SREV_RAD_5112B; - } else if (ah->ah_mac_version == (AR5K_SREV_AR2415 >> 4)) { + } else if (ah->ah_mac_version == (AR5K_SREV_AR2415 >> 4) || + ah->ah_mac_version == (AR5K_SREV_AR2315_R6 >> 4)) { ah->ah_radio = AR5K_RF2316; ah->ah_single_chip = true; ah->ah_radio_5ghz_revision = AR5K_SREV_RAD_2316;