From 57d93722c019bf227dfebbc5a2e19d5ccdb52396 Mon Sep 17 00:00:00 2001
From: Javier Cardona <javier@cozybit.com>
Date: Thu, 12 Apr 2012 14:32:21 -0700
Subject: [PATCH] --- yaml --- r: 300999 b: refs/heads/master c:
 b6ba82c893c48cfe48a98ee3dc50011832e764bd h: refs/heads/master i:   300997:
 9854ea99e1644d7bc2267076672793c45623ff48   300995:
 d60deff3f892503542d2a9d05e9ee1a2e57743a5   300991:
 31b88952e775a812c37f0438d8db2f98f4655168 v: v3

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

diff --git a/[refs] b/[refs]
index 98059fcf7bc5..fc8cb30cc154 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcca1cfc0978fa084245937ec1472b870edde97d
+refs/heads/master: b6ba82c893c48cfe48a98ee3dc50011832e764bd
diff --git a/trunk/drivers/net/wireless/mac80211_hwsim.c b/trunk/drivers/net/wireless/mac80211_hwsim.c
index 2d2bfce24fc1..3edd473d8acd 100644
--- a/trunk/drivers/net/wireless/mac80211_hwsim.c
+++ b/trunk/drivers/net/wireless/mac80211_hwsim.c
@@ -694,6 +694,7 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw,
 		    ieee80211_is_probe_resp(mgmt->frame_control))
 			mgmt->u.beacon.timestamp = cpu_to_le64(
 				rx_status.mactime +
+				(data->tsf_offset - data2->tsf_offset) +
 				24 * 8 * 10 / txrate->bitrate);
 
 		memcpy(IEEE80211_SKB_RXCB(nskb), &rx_status, sizeof(rx_status));