commit 3fa84b4a49f4646f9f96d6443d84be7640ef3262
author Dmitry Shmidt <dimitrysh@google.com> Mon Nov 23 10:37:36 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 23 10:37:36 2009 -0800
tree c4e64d213b2dbc0814a9de4455fc88e49c8a22f9
parent 2641aebcd7e9fe7cd918a9da2a1520fb677b3a4d
parent c7da28cb6aa09404070f3479be54e23609552feb

am c7da28cb: Set interface down in case of "driver stop" command (b/2271658)

Merge commit 'c7da28cb6aa09404070f3479be54e23609552feb' into eclair-plus-aosp

* commit 'c7da28cb6aa09404070f3479be54e23609552feb':
  Set interface down in case of "driver stop" command (b/2271658)

driver_wext.c

diff --git a/driver_wext.c b/driver_wext.c
index e939a00..c75dd4a 100644
--- a/driver_wext.c
+++ b/driver_wext.c
@@ -2520,12 +2520,12 @@
 	return country;
 }
 
-static int wpa_driver_priv_driver_cmd( void *priv, char *cmd, char *buf, size_t buf_len )
+static int wpa_driver_priv_driver_cmd(void *priv, char *cmd, char *buf, size_t buf_len)
 {
 	struct wpa_driver_wext_data *drv = priv;
 	struct wpa_supplicant *wpa_s = (struct wpa_supplicant *)(drv->ctx);
 	struct iwreq iwr;
-	int ret = 0;
+	int ret = 0, flags;
 
 	wpa_printf(MSG_DEBUG, "%s %s len = %d", __func__, cmd, buf_len);
 
@@ -2539,6 +2539,15 @@
 		os_snprintf(cmd, MAX_DRV_CMD_SIZE, "COUNTRY %s",
 			wpa_driver_get_country_code(no_of_chan));
 	}
+	else if (os_strcasecmp(cmd, "STOP") == 0) {
+		if ((wpa_driver_wext_get_ifflags(drv, &flags) == 0) &&
+		    (flags & IFF_UP)) {
+			wpa_printf(MSG_ERROR, "WEXT: %s when iface is UP",
+				cmd);
+			wpa_driver_wext_set_ifflags(drv, flags & ~IFF_UP);
+		}
+	}
+
 	os_memset(&iwr, 0, sizeof(iwr));
 	os_strncpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
 	os_memcpy(buf, cmd, strlen(cmd) + 1);