---

yaml --- r: 300999 b: refs/heads/master c: b6ba82c h: refs/heads/master i: 300997: 9854ea9 300995: d60deff 300991: 31b8895 v: v3
git-mirror · Apr 16, 2012 · 57d9372 · 57d9372
1 parent 03acd59
commit 57d9372
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: dcca1cfc0978fa084245937ec1472b870edde97d
+refs/heads/master: b6ba82c893c48cfe48a98ee3dc50011832e764bd
diff --git 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));