commit 1da2921415b0d9f63c3d07572f956f2b8d3929bd
author Srinivas Dasari <dasaris@qti.qualcomm.com> Mon Aug 24 19:47:32 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 24 19:47:32 2015 +0000
tree 4d020500f4230bb29c92c1cdb5f703be706b03ab
parent 3b90872698ded1567ed244faf7a9bdb047168444
parent f8467ce3721b7154974a1f8a6e0dff54d4493f4d

am f8467ce3: nl80211: Use beacon TSF if it is newer than Probe Response TSF

* commit 'f8467ce3721b7154974a1f8a6e0dff54d4493f4d':
  nl80211: Use beacon TSF if it is newer than Probe Response TSF

src/drivers/driver_nl80211_scan.c

diff --git a/src/drivers/driver_nl80211_scan.c b/src/drivers/driver_nl80211_scan.c
index 9cd3162..f3d45e5 100644
--- a/src/drivers/driver_nl80211_scan.c
+++ b/src/drivers/driver_nl80211_scan.c
@@ -583,6 +583,11 @@
 		r->flags |= WPA_SCAN_LEVEL_INVALID | WPA_SCAN_QUAL_INVALID;
 	if (bss[NL80211_BSS_TSF])
 		r->tsf = nla_get_u64(bss[NL80211_BSS_TSF]);
+	if (bss[NL80211_BSS_BEACON_TSF]) {
+		u64 tsf = nla_get_u64(bss[NL80211_BSS_BEACON_TSF]);
+		if (tsf > r->tsf)
+			r->tsf = tsf;
+	}
 	if (bss[NL80211_BSS_SEEN_MS_AGO])
 		r->age = nla_get_u32(bss[NL80211_BSS_SEEN_MS_AGO]);
 	r->ie_len = ie_len;