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

Commit c9234a66 authored by Bob Copeland's avatar Bob Copeland Committed by John W. Linville
Browse files

ath5k: correct endianness of frame duration 



The ath5k version of ieee80211_generic_frame_duration() returns
an __le16 for standard modes but a cpu-endian int for turbo/half/
quarter rates.  Make it always return cpu-endian values.

Signed-off-by: default avatarBob Copeland <me@bobcopeland.com>
Acked-by: default avatarBruno Randolf <br1@einfach.org>
Acked-by: default avatarNick Kossifidis <mickflemm@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 15411c27

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

+1 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ int ath5k_hw_get_frame_duration(struct ath5k_hw *ah, 
	if (!ah->ah_bwmode) {

		dur = ieee80211_generic_frame_duration(sc->hw,

						NULL, len, rate);

		return dur;

		return le16_to_cpu(dur);

	}



	bitrate = rate->bitrate;
@@ -265,8 +265,6 @@ static inline void ath5k_hw_write_rate_duration(struct ath5k_hw *ah) 
		 * what rate we should choose to TX ACKs. */

		tx_time = ath5k_hw_get_frame_duration(ah, 10, rate);



		tx_time = le16_to_cpu(tx_time);



		ath5k_hw_reg_write(ah, tx_time, reg);



		if (!(rate->flags & IEEE80211_RATE_SHORT_PREAMBLE))