1 files changed, 26 insertions, 31 deletions

diff --git a/drivers/net/wireless/ath/ath5k/caps.c b/drivers/net/wireless/ath/ath5k/caps.c
index beae519aa735..7dd88e1c3ff8 100644
--- a/drivers/net/wireless/ath/ath5k/caps.c
+++ b/drivers/net/wireless/ath/ath5k/caps.c
@@ -32,24 +32,24 @@
  */
 int ath5k_hw_set_capabilities(struct ath5k_hw *ah)
 {
+        struct ath5k_capabilities *caps = &ah->ah_capabilities;
         u16 ee_header;
 
         /* Capabilities stored in the EEPROM */
-        ee_header = ah->ah_capabilities.cap_eeprom.ee_header;
+        ee_header = caps->cap_eeprom.ee_header;
 
         if (ah->ah_version == AR5K_AR5210) {
                 /*
                  * Set radio capabilities
                  * (The AR5110 only supports the middle 5GHz band)
                  */
-                ah->ah_capabilities.cap_range.range_5ghz_min = 5120;
-                ah->ah_capabilities.cap_range.range_5ghz_max = 5430;
-                ah->ah_capabilities.cap_range.range_2ghz_min = 0;
-                ah->ah_capabilities.cap_range.range_2ghz_max = 0;
+                caps->cap_range.range_5ghz_min = 5120;
+                caps->cap_range.range_5ghz_max = 5430;
+                caps->cap_range.range_2ghz_min = 0;
+                caps->cap_range.range_2ghz_max = 0;
 
                 /* Set supported modes */
-                __set_bit(AR5K_MODE_11A, ah->ah_capabilities.cap_mode);
-                __set_bit(AR5K_MODE_11A_TURBO, ah->ah_capabilities.cap_mode);
+                __set_bit(AR5K_MODE_11A, caps->cap_mode);
         } else {
                 /*
                  * XXX The tranceiver supports frequencies from 4920 to 6100GHz
@@ -57,9 +57,8 @@ int ath5k_hw_set_capabilities(struct ath5k_hw *ah)
                  * XXX current ieee80211 implementation because the IEEE
                  * XXX channel mapping does not support negative channel
                  * XXX numbers (2312MHz is channel -19). Of course, this
-                 * XXX doesn't matter because these channels are out of range
-                 * XXX but some regulation domains like MKK (Japan) will
-                 * XXX support frequencies somewhere around 4.8GHz.
+                 * XXX doesn't matter because these channels are out of the
+                 * XXX legal range.
                  */
 
                 /*
@@ -67,18 +66,14 @@ int ath5k_hw_set_capabilities(struct ath5k_hw *ah)
                  */
 
                 if (AR5K_EEPROM_HDR_11A(ee_header)) {
-                        /* 4920 */
-                        ah->ah_capabilities.cap_range.range_5ghz_min = 5005;
-                        ah->ah_capabilities.cap_range.range_5ghz_max = 6100;
+                        if (ath_is_49ghz_allowed(caps->cap_eeprom.ee_regdomain))
+                                caps->cap_range.range_5ghz_min = 4920;
+                        else
+                                caps->cap_range.range_5ghz_min = 5005;
+                        caps->cap_range.range_5ghz_max = 6100;
 
                         /* Set supported modes */
-                        __set_bit(AR5K_MODE_11A,
-                                        ah->ah_capabilities.cap_mode);
-                        __set_bit(AR5K_MODE_11A_TURBO,
-                                        ah->ah_capabilities.cap_mode);
-                        if (ah->ah_version == AR5K_AR5212)
-                                __set_bit(AR5K_MODE_11G_TURBO,
-                                                ah->ah_capabilities.cap_mode);
+                        __set_bit(AR5K_MODE_11A, caps->cap_mode);
                 }
 
                 /* Enable  802.11b if a 2GHz capable radio (2111/5112) is
@@ -87,32 +82,32 @@ int ath5k_hw_set_capabilities(struct ath5k_hw *ah)
                     (AR5K_EEPROM_HDR_11G(ee_header) &&
                      ah->ah_version != AR5K_AR5211)) {
                         /* 2312 */
-                        ah->ah_capabilities.cap_range.range_2ghz_min = 2412;
-                        ah->ah_capabilities.cap_range.range_2ghz_max = 2732;
+                        caps->cap_range.range_2ghz_min = 2412;
+                        caps->cap_range.range_2ghz_max = 2732;
 
                         if (AR5K_EEPROM_HDR_11B(ee_header))
-                                __set_bit(AR5K_MODE_11B,
-                                                ah->ah_capabilities.cap_mode);
+                                __set_bit(AR5K_MODE_11B, caps->cap_mode);
 
                         if (AR5K_EEPROM_HDR_11G(ee_header) &&
                             ah->ah_version != AR5K_AR5211)
-                                __set_bit(AR5K_MODE_11G,
-                                                ah->ah_capabilities.cap_mode);
+                                __set_bit(AR5K_MODE_11G, caps->cap_mode);
                 }
         }
 
+        if ((ah->ah_radio_5ghz_revision & 0xf0) == AR5K_SREV_RAD_2112)
+                __clear_bit(AR5K_MODE_11A, caps->cap_mode);
+
         /* Set number of supported TX queues */
         if (ah->ah_version == AR5K_AR5210)
-                ah->ah_capabilities.cap_queues.q_tx_num =
-                        AR5K_NUM_TX_QUEUES_NOQCU;
+                caps->cap_queues.q_tx_num = AR5K_NUM_TX_QUEUES_NOQCU;
         else
-                ah->ah_capabilities.cap_queues.q_tx_num = AR5K_NUM_TX_QUEUES;
+                caps->cap_queues.q_tx_num = AR5K_NUM_TX_QUEUES;
 
         /* newer hardware has PHY error counters */
         if (ah->ah_mac_srev >= AR5K_SREV_AR5213A)
-                ah->ah_capabilities.cap_has_phyerr_counters = true;
+                caps->cap_has_phyerr_counters = true;
         else
-                ah->ah_capabilities.cap_has_phyerr_counters = false;
+                caps->cap_has_phyerr_counters = false;
 
         return 0;
 }