diff options
| -rw-r--r-- | drivers/net/wireless/ath9k/ath9k.h | 5 | ||||
| -rw-r--r-- | drivers/net/wireless/ath9k/hw.c | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath9k/ath9k.h b/drivers/net/wireless/ath9k/ath9k.h index 587c0fed9f8f..9976406f6d63 100644 --- a/drivers/net/wireless/ath9k/ath9k.h +++ b/drivers/net/wireless/ath9k/ath9k.h | |||
| @@ -679,11 +679,6 @@ struct ath9k_ht_cwm { | |||
| 679 | enum ath9k_ht_extprotspacing ht_extprotspacing; | 679 | enum ath9k_ht_extprotspacing ht_extprotspacing; |
| 680 | }; | 680 | }; |
| 681 | 681 | ||
| 682 | enum hal_freq_band { | ||
| 683 | HAL_FREQ_BAND_5GHZ = 0, | ||
| 684 | HAL_FREQ_BAND_2GHZ = 1, | ||
| 685 | }; | ||
| 686 | |||
| 687 | enum ath9k_ani_cmd { | 682 | enum ath9k_ani_cmd { |
| 688 | ATH9K_ANI_PRESENT = 0x1, | 683 | ATH9K_ANI_PRESENT = 0x1, |
| 689 | ATH9K_ANI_NOISE_IMMUNITY_LEVEL = 0x2, | 684 | ATH9K_ANI_NOISE_IMMUNITY_LEVEL = 0x2, |
diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c index bc5def9edd36..d4b7b63fa213 100644 --- a/drivers/net/wireless/ath9k/hw.c +++ b/drivers/net/wireless/ath9k/hw.c | |||
| @@ -465,11 +465,11 @@ static void ath9k_hw_analog_shift_rmw(struct ath_hal *ah, | |||
| 465 | } | 465 | } |
| 466 | 466 | ||
| 467 | static u8 ath9k_hw_get_num_ant_config(struct ath_hal_5416 *ahp, | 467 | static u8 ath9k_hw_get_num_ant_config(struct ath_hal_5416 *ahp, |
| 468 | enum hal_freq_band freq_band) | 468 | enum ieee80211_band freq_band) |
| 469 | { | 469 | { |
| 470 | struct ar5416_eeprom *eep = &ahp->ah_eeprom; | 470 | struct ar5416_eeprom *eep = &ahp->ah_eeprom; |
| 471 | struct modal_eep_header *pModal = | 471 | struct modal_eep_header *pModal = |
| 472 | &(eep->modalHeader[HAL_FREQ_BAND_2GHZ == freq_band]); | 472 | &(eep->modalHeader[IEEE80211_BAND_5GHZ == freq_band]); |
| 473 | struct base_eep_header *pBase = &eep->baseEepHeader; | 473 | struct base_eep_header *pBase = &eep->baseEepHeader; |
| 474 | u8 num_ant_config; | 474 | u8 num_ant_config; |
| 475 | 475 | ||
| @@ -3111,9 +3111,9 @@ static bool ath9k_hw_fill_cap_info(struct ath_hal *ah) | |||
| 3111 | pCap->reg_cap |= AR_EEPROM_EEREGCAP_EN_FCC_MIDBAND; | 3111 | pCap->reg_cap |= AR_EEPROM_EEREGCAP_EN_FCC_MIDBAND; |
| 3112 | 3112 | ||
| 3113 | pCap->num_antcfg_5ghz = | 3113 | pCap->num_antcfg_5ghz = |
| 3114 | ath9k_hw_get_num_ant_config(ahp, HAL_FREQ_BAND_5GHZ); | 3114 | ath9k_hw_get_num_ant_config(ahp, IEEE80211_BAND_5GHZ); |
| 3115 | pCap->num_antcfg_2ghz = | 3115 | pCap->num_antcfg_2ghz = |
| 3116 | ath9k_hw_get_num_ant_config(ahp, HAL_FREQ_BAND_2GHZ); | 3116 | ath9k_hw_get_num_ant_config(ahp, IEEE80211_BAND_2GHZ); |
| 3117 | 3117 | ||
| 3118 | return true; | 3118 | return true; |
| 3119 | } | 3119 | } |
