diff options
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom_4k.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom_9287.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom_def.c | 4 |
5 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c index b883b174385b..e2ae98feb0be 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | |||
@@ -968,7 +968,7 @@ static int ath9k_hw_ar9300_get_eeprom_rev(struct ath_hw *ah) | |||
968 | } | 968 | } |
969 | 969 | ||
970 | static u8 ath9k_hw_ar9300_get_num_ant_config(struct ath_hw *ah, | 970 | static u8 ath9k_hw_ar9300_get_num_ant_config(struct ath_hw *ah, |
971 | enum ieee80211_band freq_band) | 971 | enum ath9k_hal_freq_band freq_band) |
972 | { | 972 | { |
973 | return 1; | 973 | return 1; |
974 | } | 974 | } |
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.h b/drivers/net/wireless/ath/ath9k/eeprom.h index 090778da5d67..e583421fcaa6 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom.h +++ b/drivers/net/wireless/ath/ath9k/eeprom.h | |||
@@ -672,7 +672,8 @@ struct eeprom_ops { | |||
672 | bool (*fill_eeprom)(struct ath_hw *hw); | 672 | bool (*fill_eeprom)(struct ath_hw *hw); |
673 | int (*get_eeprom_ver)(struct ath_hw *hw); | 673 | int (*get_eeprom_ver)(struct ath_hw *hw); |
674 | int (*get_eeprom_rev)(struct ath_hw *hw); | 674 | int (*get_eeprom_rev)(struct ath_hw *hw); |
675 | u8 (*get_num_ant_config)(struct ath_hw *hw, enum ieee80211_band band); | 675 | u8 (*get_num_ant_config)(struct ath_hw *hw, |
676 | enum ath9k_hal_freq_band band); | ||
676 | u32 (*get_eeprom_antenna_cfg)(struct ath_hw *hw, | 677 | u32 (*get_eeprom_antenna_cfg)(struct ath_hw *hw, |
677 | struct ath9k_channel *chan); | 678 | struct ath9k_channel *chan); |
678 | void (*set_board_values)(struct ath_hw *hw, struct ath9k_channel *chan); | 679 | void (*set_board_values)(struct ath_hw *hw, struct ath9k_channel *chan); |
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c index 2e1397b68a87..ead8b0dd3b53 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c +++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c | |||
@@ -1161,7 +1161,7 @@ static u32 ath9k_hw_4k_get_eeprom_antenna_cfg(struct ath_hw *ah, | |||
1161 | } | 1161 | } |
1162 | 1162 | ||
1163 | static u8 ath9k_hw_4k_get_num_ant_config(struct ath_hw *ah, | 1163 | static u8 ath9k_hw_4k_get_num_ant_config(struct ath_hw *ah, |
1164 | enum ieee80211_band freq_band) | 1164 | enum ath9k_hal_freq_band freq_band) |
1165 | { | 1165 | { |
1166 | return 1; | 1166 | return 1; |
1167 | } | 1167 | } |
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c index dff2da777312..e6186515d05b 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c +++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c | |||
@@ -1126,7 +1126,7 @@ static void ath9k_hw_ar9287_set_board_values(struct ath_hw *ah, | |||
1126 | } | 1126 | } |
1127 | 1127 | ||
1128 | static u8 ath9k_hw_ar9287_get_num_ant_config(struct ath_hw *ah, | 1128 | static u8 ath9k_hw_ar9287_get_num_ant_config(struct ath_hw *ah, |
1129 | enum ieee80211_band freq_band) | 1129 | enum ath9k_hal_freq_band freq_band) |
1130 | { | 1130 | { |
1131 | return 1; | 1131 | return 1; |
1132 | } | 1132 | } |
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c index afa2b73ddbdd..23f480d4c770 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom_def.c +++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c | |||
@@ -1418,11 +1418,11 @@ static void ath9k_hw_def_set_txpower(struct ath_hw *ah, | |||
1418 | } | 1418 | } |
1419 | 1419 | ||
1420 | static u8 ath9k_hw_def_get_num_ant_config(struct ath_hw *ah, | 1420 | static u8 ath9k_hw_def_get_num_ant_config(struct ath_hw *ah, |
1421 | enum ieee80211_band freq_band) | 1421 | enum ath9k_hal_freq_band freq_band) |
1422 | { | 1422 | { |
1423 | struct ar5416_eeprom_def *eep = &ah->eeprom.def; | 1423 | struct ar5416_eeprom_def *eep = &ah->eeprom.def; |
1424 | struct modal_eep_header *pModal = | 1424 | struct modal_eep_header *pModal = |
1425 | &(eep->modalHeader[ATH9K_HAL_FREQ_BAND_2GHZ == freq_band]); | 1425 | &(eep->modalHeader[freq_band]); |
1426 | struct base_eep_header *pBase = &eep->baseEepHeader; | 1426 | struct base_eep_header *pBase = &eep->baseEepHeader; |
1427 | u8 num_ant_config; | 1427 | u8 num_ant_config; |
1428 | 1428 | ||