commit 2b81de9bd913596373db585fa4b384a49ad6da2a
author Mitchell Wills <mwills@google.com> Thu Aug 27 05:12:03 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 27 05:12:03 2015 +0000
tree 4579bb65858b7b4afa33583dd6b0f221b31bcc94
parent 154f26ed3ee39e55e6d37e5f53cbc2ff95138531
parent dca875431cdd4a6a1f135ed718ee5ce60e230528

am dca87543: (-s ours) am 447c7ff8: Make sure configuration is saved to storage device

* commit 'dca875431cdd4a6a1f135ed718ee5ce60e230528':

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;