From 49a1c4cb0140a6680b7a3aaad7be12521f133b28 Mon Sep 17 00:00:00 2001 From: Thomas Pedersen Date: Wed, 2 Jan 2013 14:55:16 -0800 Subject: [PATCH] --- yaml --- r: 351847 b: refs/heads/master c: 45034bfb8c9ecc62db40b438bea7fe728ac8facf h: refs/heads/master i: 351845: 95fea220e672980d4ab0f2b2e1903da24881f5ff 351843: 557de26682688c5da2b66e2d98fa8321a2043c15 351839: 773f441e1b78eff844414ca9a4d491917e6c0c8c v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mac80211_hwsim.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 633f622f4396..f07e82bdb304 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75ea719cb4773b05cc48e741feb4e267522b9656 +refs/heads/master: 45034bfb8c9ecc62db40b438bea7fe728ac8facf diff --git a/trunk/drivers/net/wireless/mac80211_hwsim.c b/trunk/drivers/net/wireless/mac80211_hwsim.c index d248a4cc6656..807d713414f8 100644 --- a/trunk/drivers/net/wireless/mac80211_hwsim.c +++ b/trunk/drivers/net/wireless/mac80211_hwsim.c @@ -361,7 +361,7 @@ struct mac80211_hwsim_data { int power_level; /* difference between this hw's clock and the real clock, in usecs */ - u64 tsf_offset; + s64 tsf_offset; }; @@ -427,9 +427,10 @@ static void mac80211_hwsim_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u64 tsf) { struct mac80211_hwsim_data *data = hw->priv; - struct timeval tv = ktime_to_timeval(ktime_get_real()); - u64 now = tv.tv_sec * USEC_PER_SEC + tv.tv_usec; - data->tsf_offset = tsf - now; + u64 now = mac80211_hwsim_get_tsf(hw, vif); + s64 delta = tsf - now; + + data->tsf_offset += delta; } static void mac80211_hwsim_monitor_rx(struct ieee80211_hw *hw,