---

yaml
---
r: 89975
b: refs/heads/master
c: 38c07b4
h: refs/heads/master
i:
  89973: caa5cc2
  89971: e1752ab
  89967: 1a8392d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6084239d39a10bac1186611fe7c523cea92c9ec
+refs/heads/master: 38c07b430b50172b803fe4c7f76cba580ba9931f

trunk/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");
 		}

trunk/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);