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

Commit 71ba1c30 authored by Nick Kossifidis's avatar Nick Kossifidis Committed by John W. Linville
Browse files

ath5k: Always set IFS intervals on reset 



 * Make sure we always set IFS timings even if no
 coverage class is set. If we don't we'll miss the
 needed changes for different bwmodes.

 Signed-off-by: default avatarNick Kossifidis <mickflemm@gmail.com>

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 473cae27

drivers/net/wireless/ath/ath5k/ath5k.h

+1 −0
Original line number Diff line number Diff line
@@ -1224,6 +1224,7 @@ int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac); 
/* Helpers */

int ath5k_hw_get_frame_duration(struct ath5k_hw *ah,

		int len, struct ieee80211_rate *rate);

unsigned int ath5k_hw_get_default_slottime(struct ath5k_hw *ah);

unsigned int ath5k_hw_get_default_sifs(struct ath5k_hw *ah);

extern int ath5k_hw_set_opmode(struct ath5k_hw *ah, enum nl80211_iftype opmode);

void ath5k_hw_set_coverage_class(struct ath5k_hw *ah, u8 coverage_class);

drivers/net/wireless/ath/ath5k/pcu.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ int ath5k_hw_get_frame_duration(struct ath5k_hw *ah, 
 *

 * @ah: The &struct ath5k_hw

 */

static unsigned int ath5k_hw_get_default_slottime(struct ath5k_hw *ah)

unsigned int ath5k_hw_get_default_slottime(struct ath5k_hw *ah)

{

	struct ieee80211_channel *channel = ah->ah_current_channel;

	unsigned int slot_time;

drivers/net/wireless/ath/ath5k/qcu.c

+8 −0
Original line number Diff line number Diff line
@@ -652,5 +652,13 @@ int ath5k_hw_init_queues(struct ath5k_hw *ah) 
		AR5K_REG_ENABLE_BITS(ah, AR5K_DCU_GBL_IFS_MISC,

				AR5K_DCU_GBL_IFS_MISC_TURBO_MODE);



	/* If we didn't set IFS timings through

	 * ath5k_hw_set_coverage_class make sure

	 * we set them here */

	if (!ah->ah_coverage_class) {

		unsigned int slot_time = ath5k_hw_get_default_slottime(ah);

		ath5k_hw_set_ifs_intervals(ah, slot_time);

	}



	return 0;

}