lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ath9k: Use mac80211's band macros and remove enum hal_freq_band

Browse Source 
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Sujith
2008-08-07 10:53:39 +05:30
committed by John W. Linville
parent ea9880fb05
commit 06df8bea27
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/ath9k/ath9k.h
View File

@@ -679,11 +679,6 @@ struct ath9k_ht_cwm {
enum ath9k_ht_extprotspacing ht_extprotspacing; enum ath9k_ht_extprotspacing ht_extprotspacing;
}; };
enum hal_freq_band {
HAL_FREQ_BAND_5GHZ = 0,
HAL_FREQ_BAND_2GHZ = 1,
};
enum ath9k_ani_cmd { enum ath9k_ani_cmd {
ATH9K_ANI_PRESENT = 0x1, ATH9K_ANI_PRESENT = 0x1,
ATH9K_ANI_NOISE_IMMUNITY_LEVEL = 0x2, ATH9K_ANI_NOISE_IMMUNITY_LEVEL = 0x2,

8
drivers/net/wireless/ath9k/hw.c
View File

@@ -465,11 +465,11 @@ static void ath9k_hw_analog_shift_rmw(struct ath_hal *ah,
} }
static u8 ath9k_hw_get_num_ant_config(struct ath_hal_5416 *ahp, static u8 ath9k_hw_get_num_ant_config(struct ath_hal_5416 *ahp,
enum hal_freq_band freq_band) enum ieee80211_band freq_band)
{ {
struct ar5416_eeprom *eep = &ahp->ah_eeprom; struct ar5416_eeprom *eep = &ahp->ah_eeprom;
struct modal_eep_header *pModal = struct modal_eep_header *pModal =
&(eep->modalHeader[HAL_FREQ_BAND_2GHZ == freq_band]); &(eep->modalHeader[IEEE80211_BAND_5GHZ == freq_band]);
struct base_eep_header *pBase = &eep->baseEepHeader; struct base_eep_header *pBase = &eep->baseEepHeader;
u8 num_ant_config; u8 num_ant_config;
@@ -3111,9 +3111,9 @@ static bool ath9k_hw_fill_cap_info(struct ath_hal *ah)
pCap->reg_cap |= AR_EEPROM_EEREGCAP_EN_FCC_MIDBAND; pCap->reg_cap |= AR_EEPROM_EEREGCAP_EN_FCC_MIDBAND;
pCap->num_antcfg_5ghz = pCap->num_antcfg_5ghz =
ath9k_hw_get_num_ant_config(ahp, HAL_FREQ_BAND_5GHZ); ath9k_hw_get_num_ant_config(ahp, IEEE80211_BAND_5GHZ);
pCap->num_antcfg_2ghz = pCap->num_antcfg_2ghz =
ath9k_hw_get_num_ant_config(ahp, HAL_FREQ_BAND_2GHZ); ath9k_hw_get_num_ant_config(ahp, IEEE80211_BAND_2GHZ);
return true; return true;
} }