On Tue January 25 2011 13:31:44 Bob Copeland wrote: > 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: Bob Copeland <me@xxxxxxxxxxxxxxx> > --- > drivers/net/wireless/ath/ath5k/pcu.c | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath5k/pcu.c > b/drivers/net/wireless/ath/ath5k/pcu.c index e5f2b96..a702817 100644 > --- a/drivers/net/wireless/ath/ath5k/pcu.c > +++ b/drivers/net/wireless/ath/ath5k/pcu.c > @@ -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)) I wonder what effect this has in ath5k_hw_set_ifs_intervals() where ack_tx_time was little endian before... But the change makes sense. Acked-by: Bruno Randolf <br1@xxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html