diff options
| author | Simon Barber <simon.barber@meraki.net> | 2017-06-07 12:06:26 -0700 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2017-06-09 11:43:34 +0000 |
| commit | 2931ba843107b8775a2e33a6f27d1908d4950df8 (patch) | |
| tree | 4833db301f10dd0967a82f7a235984f0807db027 /epan | |
| parent | 2ea72fa42b85567f63ef9d848941a7a44daa2e1c (diff) | |
| download | wireshark-2931ba843107b8775a2e33a6f27d1908d4950df8.tar.gz | |
ieee80211-radio: Fix calculation of frame start time
With captures where TSF indicates the end of the frame the
preamble was being counted twice in the calculation of the start.
Change-Id: I3d042d8ea3bc46a833438cb3d2f75e3499a7711d
Reviewed-on: https://code.wireshark.org/review/22020
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
(cherry picked from commit 33456f48ac9a3842e1eda8e179ae9d8bd4c33140)
Reviewed-on: https://code.wireshark.org/review/22050
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ieee80211-radio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ieee80211-radio.c b/epan/dissectors/packet-ieee80211-radio.c index 59b2cfdf31..73f1821c61 100644 --- a/epan/dissectors/packet-ieee80211-radio.c +++ b/epan/dissectors/packet-ieee80211-radio.c @@ -1095,7 +1095,7 @@ dissect_wlan_radio_phdr (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, agg_tracker_list = NULL; }; } else if (wlan_radio_tsf_at_end) { - wlan_radio_info->start_tsf = phdr->tsf_timestamp - duration - preamble; + wlan_radio_info->start_tsf = phdr->tsf_timestamp - duration; wlan_radio_info->end_tsf = phdr->tsf_timestamp; } else { wlan_radio_info->start_tsf = phdr->tsf_timestamp + prior_duration - preamble; |