Commit: c5f70d689ab6e50a51caa2d13fa85812574fc32a - external-wpa_supplicant_6 (git)

external/wpa_supplicant_6

Commit MetaInfo

• Revision: c5f70d689ab6e50a51caa2d13fa85812574fc32a (tree)
• Zeit: 2011-02-23 09:41:33
• Autor: Dmitry Shmidt <dimitrysh@goog...>
• Commiter: Irfan Sheriff

Log Message

WEXT: Suppress scan errors during background scan

Change-Id: Iabc142f7d36955b55ac39605fe524b5edcc8c43c
Signed-off-by: Dmitry Shmidt <[e-mail]>

Ändern Zusammenfassung

• modified: wpa_supplicant/src/drivers/driver_wext.c
• modified: wpa_supplicant/src/drivers/driver_wext.h

Diff

--- a/wpa_supplicant/src/drivers/driver_wext.c
+++ b/wpa_supplicant/src/drivers/driver_wext.c
@@ -969,6 +969,7 @@ void * wpa_driver_wext_init(void *ctx, const char *ifname)
 	drv->errors = 0;
 	drv->driver_is_started = TRUE;
 	drv->skip_disconnect = 0;
+	drv->bgscan_enabled = 0;
 #endif
 	wpa_driver_wext_finish_drv_init(drv);
 
@@ -1254,7 +1255,10 @@ int wpa_driver_wext_combo_scan(void *priv, struct wpa_ssid **ssid_ptr,
 	iwr.u.data.length = bp;
 
 	if ((ret = ioctl(drv->ioctl_sock, SIOCSIWPRIV, &iwr)) < 0) {
-		wpa_printf(MSG_ERROR, "ioctl[SIOCSIWPRIV] (cscan): %d", ret);
+		if (!drv->bgscan_enabled)
+			wpa_printf(MSG_ERROR, "ioctl[SIOCSIWPRIV] (cscan): %d", ret);
+		else
+			ret = 0;	/* Hide error in case of bg scan */
 		*ssid_ptr = ssid_orig;
 		/* goto old_scan; */
 	}
@@ -2704,8 +2708,10 @@ static int wpa_driver_priv_driver_cmd( void *priv, char *cmd, char *buf, size_t
 			return ret;
 		}
 		os_strncpy(cmd, "PNOFORCE 1", MAX_DRV_CMD_SIZE);
+		drv->bgscan_enabled = 1;
 	} else if( os_strcasecmp(cmd, "BGSCAN-STOP") == 0 ) {
 		os_strncpy(cmd, "PNOFORCE 0", MAX_DRV_CMD_SIZE);
+		drv->bgscan_enabled = 0;
 	}
 
 	os_memset(&iwr, 0, sizeof(iwr));

--- a/wpa_supplicant/src/drivers/driver_wext.h
+++ b/wpa_supplicant/src/drivers/driver_wext.h
@@ -47,6 +47,7 @@ struct wpa_driver_wext_data {
 	int errors;
 	int driver_is_started;
 	int skip_disconnect;
+	int bgscan_enabled;
 #endif
 };