---

yaml --- r: 103286 b: refs/heads/master c: 4faeb86 h: refs/heads/master v: v3
git-mirror · Jun 30, 2008 · d66e520 · d66e520
1 parent 4a8fbe5
commit d66e520
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);