diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-03-12 12:44:17 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2013-03-12 12:44:17 -0700 |
| commit | 2f023193a0fd630eb82ce6381b80911ad5a3462f (patch) | |
| tree | 223bec90f0613b193a63b670f3edad96de2e70b6 /wpa_supplicant/scan.c | |
| parent | 26a19b244b797b825575f0851e16e2b2ad5dc174 (diff) | |
| download | android_external_wpa_supplicant_8-2f023193a0fd630eb82ce6381b80911ad5a3462f.tar.gz android_external_wpa_supplicant_8-2f023193a0fd630eb82ce6381b80911ad5a3462f.tar.bz2 android_external_wpa_supplicant_8-2f023193a0fd630eb82ce6381b80911ad5a3462f.zip | |
Accumulative patch from commit f46fc73a3f8d0eeb1b43d17769464884f467ac47
P2P: Add a peer entry based on Association Request frame
P2P: Clear p2p_in_provisioning flag on group removal
Allow SME SA Query to be used by all drivers
Android: Sync makefile changes for HT/VHT overrides
wpa_supplicant: Support VHT capability overrides
wpa_supplicant: Parse int values in different bases and reject invalid
wpa_supplicant: Reschedule sched scan after network change
Remove unnecessary local variable
wpa_supplicant: Handle enabling of one or all networks equally
wpa_supplicant: Save prev_sched_ssid only if needed
wpa_supplicant: Do not allow too short sched scan
nl80211: Use helper function for phy_info_freqs()
nl80211: Split phy_info_band() into smaller helper functions
nl80211: Use helper function for phy_info_handler()
nl80211: Split wiphy_info_handler() into smaller helper functions
nl80211: Support splitting wiphy information in dumps
Synchronize with wireless-testing.git include/uapi/linux/nl80211.h
SAE: Add forgotten commit element validation step for FFC groups
SAE: Move commit element validation steps into single location
Change-Id: I369b6493f03714f6cfb4ed4a8c10ee6e6e71c1f8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wpa_supplicant/scan.c')
| -rw-r--r-- | wpa_supplicant/scan.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 91a436a0..54afd012 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -1134,8 +1134,16 @@ scan: wpa_s->first_sched_scan = 0; wpa_s->sched_scan_timeout /= 2; wpa_s->sched_scan_interval *= 2; + if (wpa_s->sched_scan_timeout < wpa_s->sched_scan_interval) { + wpa_s->sched_scan_interval = 10; + wpa_s->sched_scan_timeout = max_sched_scan_ssids * 2; + } } + /* If there is no more ssids, start next time from the beginning */ + if (!ssid) + wpa_s->prev_sched_ssid = NULL; + return 0; } |