From 2772d751b4fe5e8062cc84dca1fb156aa48250cb Mon Sep 17 00:00:00 2001
From: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Date: Fri, 27 Feb 2009 16:21:20 -0800
Subject: [PATCH] --- yaml --- r: 135071 b: refs/heads/master c:
 7c4cbb6ee0a55885d697a5b07b6c4c8fd10d573a h: refs/heads/master i:   135069:
 dacb953879f51050ac69a5bf788fdfba696512a4   135067:
 546eecfe9b3a298e14576dc62eb21ac8119b9e7d   135063:
 530fc85d41097fdffa9807464b2d4724e67a3988   135055:
 394169f43862f5f8da61ee18d01976e21dee77b5   135039:
 a1faa895b3f15f122214fdfc7fae0813836cf65c v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 54ebb2bd0a83..9325d6743f6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39e6d2256b8b8265ef16297887b5521f3e0155c6
+refs/heads/master: 7c4cbb6ee0a55885d697a5b07b6c4c8fd10d573a
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
index d0596e7f64e6..4dbaf04c5f51 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -4305,6 +4305,7 @@ static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk
 {
 	struct iwl_priv *priv = hw->priv;
 	unsigned long flags;
+	__le64 timestamp;
 
 	IWL_DEBUG_MAC80211(priv, "enter\n");
 
@@ -4326,6 +4327,8 @@ static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk
 	priv->ibss_beacon = skb;
 
 	priv->assoc_id = 0;
+	timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;
+	priv->timestamp = le64_to_cpu(timestamp);
 
 	IWL_DEBUG_MAC80211(priv, "leave\n");
 	spin_unlock_irqrestore(&priv->lock, flags);