summaryrefslogtreecommitdiff
path: root/wpa_supplicant/bgscan.c
diff options
context:
space:
mode:
authorStefan Lippers-Hollmann <s.l-h@gmx.de>2014-06-29 23:18:53 +0000
committerAndrew Shadura <andrewsh@debian.org>2016-07-20 21:37:01 +0200
commit3a03694454bbec18114240b108a0af232133766b (patch)
treeade1c03a378de7430ac902dab71fb96576508eb6 /wpa_supplicant/bgscan.c
parentc2af19e367fc0d1abca6a52d00b239618e8c6186 (diff)
Imported Upstream version 2.1
Diffstat (limited to 'wpa_supplicant/bgscan.c')
-rw-r--r--wpa_supplicant/bgscan.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/wpa_supplicant/bgscan.c b/wpa_supplicant/bgscan.c
index 5661830..f74cdbf 100644
--- a/wpa_supplicant/bgscan.c
+++ b/wpa_supplicant/bgscan.c
@@ -2,14 +2,8 @@
* WPA Supplicant - background scan and roaming interface
* Copyright (c) 2009-2010, Jouni Malinen <j@w1.fi>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
*/
#include "includes.h"
@@ -37,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;
@@ -47,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) {