ath9k: Incorrect band enum causes invalid antenna configuration.

It's a regression from the patch titled "ath9k: Use mac80211's band
macros and remove enum hal_freq_band". MAC80211 band macros can't be
mapped directly with our hal band enum.

Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 8 insertions, 3 deletions

diff --git a/drivers/net/wireless/ath9k/eeprom.c b/drivers/net/wireless/ath9k/eeprom.c
index d4e51dda413c..14f8d40c1427 100644
--- a/drivers/net/wireless/ath9k/eeprom.c
+++ b/drivers/net/wireless/ath9k/eeprom.c
@@ -2631,7 +2631,7 @@ u8 ath9k_hw_get_def_num_ant_config(struct ath_hal *ah,
         struct ath_hal_5416 *ahp = AH5416(ah);
         struct ar5416_eeprom_def *eep = &ahp->ah_eeprom.def;
         struct modal_eep_header *pModal =
-                &(eep->modalHeader[IEEE80211_BAND_5GHZ == freq_band]);
+                &(eep->modalHeader[ATH9K_HAL_FREQ_BAND_2GHZ == freq_band]);
         struct base_eep_header *pBase = &eep->baseEepHeader;
         u8 num_ant_config;
 
diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c
index e95dfa0a030a..58f94c3f5e94 100644
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
@@ -3387,9 +3387,9 @@ bool ath9k_hw_fill_cap_info(struct ath_hal *ah)
         pCap->reg_cap |= AR_EEPROM_EEREGCAP_EN_FCC_MIDBAND;
 
         pCap->num_antcfg_5ghz =
-                ath9k_hw_get_num_ant_config(ah, IEEE80211_BAND_5GHZ);
+                ath9k_hw_get_num_ant_config(ah, ATH9K_HAL_FREQ_BAND_5GHZ);
         pCap->num_antcfg_2ghz =
-                ath9k_hw_get_num_ant_config(ah, IEEE80211_BAND_2GHZ);
+                ath9k_hw_get_num_ant_config(ah, ATH9K_HAL_FREQ_BAND_2GHZ);
 
         return true;
 }
diff --git a/drivers/net/wireless/ath9k/hw.h b/drivers/net/wireless/ath9k/hw.h
index a4d52850bdd0..91d8f594af81 100644
--- a/drivers/net/wireless/ath9k/hw.h
+++ b/drivers/net/wireless/ath9k/hw.h
@@ -495,6 +495,11 @@ enum ar5416_rates {
         Ar5416RateSize
 };
 
+enum ath9k_hal_freq_band {
+        ATH9K_HAL_FREQ_BAND_5GHZ = 0,
+        ATH9K_HAL_FREQ_BAND_2GHZ = 1
+};
+
 struct base_eep_header {
         u16 length;
         u16 checksum;