summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Cardona <javier@cozybit.com>2012-04-12 14:32:21 -0700
committerJohn W. Linville <linville@tuxdriver.com>2012-04-16 14:19:29 -0400
commitb6ba82c893c48cfe48a98ee3dc50011832e764bd (patch)
tree896863b5b594c7efe043ad4f1d63ff34a74e636e
parentdcca1cfc0978fa084245937ec1472b870edde97d (diff)
downloadlinux-3.10-b6ba82c893c48cfe48a98ee3dc50011832e764bd.tar.gz
linux-3.10-b6ba82c893c48cfe48a98ee3dc50011832e764bd.tar.bz2
linux-3.10-b6ba82c893c48cfe48a98ee3dc50011832e764bd.zip
mac80211_hwsim: fixup for tsf setting
Last patch I sent failed to take into account the offset of each phy. Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/mac80211_hwsim.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 2d2bfce24fc..3edd473d8ac 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/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));