Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06df8bea authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

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



Signed-off-by: default avatarSujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ea9880fb

drivers/net/wireless/ath9k/ath9k.h

+0 −5
Original line number Diff line number Diff line
@@ -679,11 +679,6 @@ struct ath9k_ht_cwm { 
	enum ath9k_ht_extprotspacing ht_extprotspacing;

};



enum hal_freq_band {

	HAL_FREQ_BAND_5GHZ = 0,

	HAL_FREQ_BAND_2GHZ = 1,

};



enum ath9k_ani_cmd {

	ATH9K_ANI_PRESENT = 0x1,

	ATH9K_ANI_NOISE_IMMUNITY_LEVEL = 0x2,

drivers/net/wireless/ath9k/hw.c

+4 −4
Original line number Diff line number Diff line
@@ -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,

					    enum hal_freq_band freq_band)

				      enum ieee80211_band freq_band)

{

	struct ar5416_eeprom *eep = &ahp->ah_eeprom;

	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;

	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->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 =

		ath9k_hw_get_num_ant_config(ahp, HAL_FREQ_BAND_2GHZ);

		ath9k_hw_get_num_ant_config(ahp, IEEE80211_BAND_2GHZ);



	return true;

}