commit 289d1289b5698bfbc81a54e11cea5f10f8a62693
author Mitchell Wills <mwills@google.com> Wed Aug 26 01:01:12 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 26 01:01:12 2015 +0000
tree 12862fc75185d913a6f459b5fe7e4fcf7c8032ac
parent f8467ce3721b7154974a1f8a6e0dff54d4493f4d
parent 447c7ff83da0d89ffa70c378be2a4a58f9b14d3b

am 447c7ff8: Make sure configuration is saved to storage device

* commit '447c7ff83da0d89ffa70c378be2a4a58f9b14d3b':
  Make sure configuration is saved to storage device

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;