From d66e520b825a1c687fe22a90d105c6136628bde6 Mon Sep 17 00:00:00 2001
From: Assaf Krauss <assaf.krauss@intel.com>
Date: Mon, 30 Jun 2008 17:23:16 +0800
Subject: [PATCH] --- yaml --- r: 103286 b: refs/heads/master c:
 4faeb86070c38c0df9f5a23c3f6acf5538492a33 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mlme.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 73133b7ba4cb..8774febc8bed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 052ec3f13973c789c89068573d3b06c983711d81
+refs/heads/master: 4faeb86070c38c0df9f5a23c3f6acf5538492a33
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 1e4054b273dd..0a310d09ab07 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2503,6 +2503,7 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
 		memcpy(mgmt->bssid, ifsta->bssid, ETH_ALEN);
 		mgmt->u.beacon.beacon_int =
 			cpu_to_le16(local->hw.conf.beacon_int);
+		mgmt->u.beacon.timestamp = cpu_to_le64(bss->timestamp);
 		mgmt->u.beacon.capab_info = cpu_to_le16(bss->capability);
 
 		pos = skb_put(skb, 2 + ifsta->ssid_len);