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

Commit 2df1bff4 authored by Senthil Balasubramanian's avatar Senthil Balasubramanian Committed by John W. Linville
Browse files

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: default avatarSenthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e7594072

drivers/net/wireless/ath9k/eeprom.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/ath9k/hw.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

drivers/net/wireless/ath9k/hw.h

+5 −0
Original line number Diff line number Diff line
@@ -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;