diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-11-05 10:07:29 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2013-11-05 10:07:29 -0800 |
| commit | b96dad47218788efffa3db0fe7f1b54a7d19e366 (patch) | |
| tree | aadd283f80c68c591a199b319d4c11d3fd0f7788 /wpa_supplicant/bgscan.c | |
| parent | 4e45558d160f5ae131def0e63ff7f6b2e41d9fe2 (diff) | |
| download | android_external_wpa_supplicant_8-b96dad47218788efffa3db0fe7f1b54a7d19e366.tar.gz android_external_wpa_supplicant_8-b96dad47218788efffa3db0fe7f1b54a7d19e366.tar.bz2 android_external_wpa_supplicant_8-b96dad47218788efffa3db0fe7f1b54a7d19e366.zip | |
Cumulative patch from commit 2b6623ab134fff6d96114f5fe329a2f87d5e893a
2b6623a hostapd: Do not terminate process on dynamic interface add failure
217cf49 P2P: Add more debug prints for frequency selection
4dd3f86 P2P: Fix bug in GO frequency selection
9804873 wpa_supplicant: Fix bug in get_shared_radio_freqs
3342c26 wpa_supplicant: Fix updating GO beacons on WFD subelements change
72c12c1 EAPOL: Fix static analyzer warnings for pac_opaque_encr_key
3139270 bgscan: Add global bgscan configuration
efc58df eap_proxy: Re-read IMSI from proxy in Interworking functionality
Change-Id: I006abd3b52fbbd1a7b97059364c72ab0386d5f63
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wpa_supplicant/bgscan.c')
| -rw-r--r-- | wpa_supplicant/bgscan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wpa_supplicant/bgscan.c b/wpa_supplicant/bgscan.c index 9a9bd520..f74cdbf2 100644 --- a/wpa_supplicant/bgscan.c +++ b/wpa_supplicant/bgscan.c @@ -31,9 +31,9 @@ static const struct bgscan_ops * bgscan_modules[] = { }; -int bgscan_init(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) +int bgscan_init(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid, + const char *name) { - const char *name = ssid->bgscan; const char *params; size_t nlen; int i; @@ -41,7 +41,7 @@ int bgscan_init(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) bgscan_deinit(wpa_s); if (name == NULL) - return 0; + return -1; params = os_strchr(name, ':'); if (params == NULL) { |