Return-path: Received: from an-out-0708.google.com ([209.85.132.242]:9933 "EHLO an-out-0708.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752711AbYB0GAC (ORCPT ); Wed, 27 Feb 2008 01:00:02 -0500 Received: by an-out-0708.google.com with SMTP id d31so578690and.103 for ; Tue, 26 Feb 2008 21:59:59 -0800 (PST) Message-ID: <40f31dec0802262159p293d2e95ucb653b09be8b07ce@mail.gmail.com> (sfid-20080227_060006_355080_DCD042E4) Date: Wed, 27 Feb 2008 07:59:58 +0200 From: "Nick Kossifidis" To: "Pavel Roskin" Subject: Re: [ath5k-devel] [PATCH] ath5k: fix all endian issues reported by sparse Cc: linux-wireless@vger.kernel.org, ath5k-devel@lists.ath5k.org In-Reply-To: <20080226225914.28153.48243.stgit@dv.roinet.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 References: <20080226225914.28153.48243.stgit@dv.roinet.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: 2008/2/27, Pavel Roskin : > Changes-licensed-under: ISC > Signed-off-by: Pavel Roskin > --- > > drivers/net/wireless/ath5k/base.c | 8 ++++---- > drivers/net/wireless/ath5k/hw.c | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c > index 0b743f7..393b5f3 100644 > --- a/drivers/net/wireless/ath5k/base.c > +++ b/drivers/net/wireless/ath5k/base.c > @@ -1717,11 +1717,11 @@ ath5k_check_ibss_hw_merge(struct ath5k_softc *sc, struct sk_buff *skb) > u32 hw_tu; > struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data; > > - if ((mgmt->frame_control & IEEE80211_FCTL_FTYPE) == > + if ((le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_FTYPE) == > IEEE80211_FTYPE_MGMT && > - (mgmt->frame_control & IEEE80211_FCTL_STYPE) == > + (le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE) == > IEEE80211_STYPE_BEACON && > - mgmt->u.beacon.capab_info & WLAN_CAPABILITY_IBSS && > + le16_to_cpu(mgmt->u.beacon.capab_info) & WLAN_CAPABILITY_IBSS && > memcmp(mgmt->bssid, sc->ah->ah_bssid, ETH_ALEN) == 0) { > /* > * Received an IBSS beacon with the same BSSID. Hardware might > @@ -1730,7 +1730,7 @@ ath5k_check_ibss_hw_merge(struct ath5k_softc *sc, struct sk_buff *skb) > hw_tu = TSF_TO_TU(ath5k_hw_get_tsf64(sc->ah)); > if (hw_tu >= sc->nexttbtt) { > ath5k_beacon_update_timers(sc, > - mgmt->u.beacon.timestamp); > + le64_to_cpu(mgmt->u.beacon.timestamp)); > ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON, > "detected HW merge from received beacon\n"); > } > diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c > index 998da6b..eec2b80 100644 > --- a/drivers/net/wireless/ath5k/hw.c > +++ b/drivers/net/wireless/ath5k/hw.c > @@ -531,8 +531,8 @@ static inline void ath5k_hw_write_rate_duration(struct ath5k_hw *ah, > * actual rate for this rate. See mac80211 tx.c > * ieee80211_duration() for a brief description of > * what rate we should choose to TX ACKs. */ > - tx_time = ieee80211_generic_frame_duration(sc->hw, > - sc->vif, 10, &srate); > + tx_time = le16_to_cpu(ieee80211_generic_frame_duration(sc->hw, > + sc->vif, 10, &srate)); > > ath5k_hw_reg_write(ah, tx_time, reg); > Acked-by: Nick Kossifidis -- GPG ID: 0xD21DB2DB As you read this post global entropy rises. Have Fun ;-) Nick