From: Javier Cardona Date: Thu, 12 Apr 2012 21:32:21 +0000 (-0700) Subject: mac80211_hwsim: fixup for tsf setting X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b6ba82c893c48cfe48a98ee3dc50011832e764bd;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git 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 Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 2d2bfce24fc1..3edd473d8acd 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));