commit ae83a002c9364f4a37eedc6ac49478657c2721fe
author The Android Open Source Project <initial-contribution@android.com> Tue Dec 13 19:13:13 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 13 19:13:13 2011 -0800
tree 1723cd2e7721dcd69e73ed0e5d3ca2b38802b703
parent e8d98ae1c8ca7fe8558a30063f8ed36847e153b4
parent a86c6aae54ed2f387f0cadd0d7677afe656275d1

am a86c6aae: Reconcile with ics-mr1-release

* commit 'a86c6aae54ed2f387f0cadd0d7677afe656275d1':

bcm4329/wpa_supplicant_8_lib/driver_cmd_wext.c

diff --git a/bcm4329/wpa_supplicant_8_lib/driver_cmd_wext.c b/bcm4329/wpa_supplicant_8_lib/driver_cmd_wext.c
index 8aa45d6..b19b70d 100644
--- a/bcm4329/wpa_supplicant_8_lib/driver_cmd_wext.c
+++ b/bcm4329/wpa_supplicant_8_lib/driver_cmd_wext.c
@@ -73,7 +73,6 @@
 	struct iwreq iwr;
 	int ret, bp;
 	unsigned i;
-	struct wpa_supplicant *wpa_s = (struct wpa_supplicant *)(drv->ctx);
 
 	if (!drv->driver_is_started) {
 		wpa_printf(MSG_DEBUG, "%s: Driver stopped", __func__);

bcmdhd/wpa_supplicant_8_lib/driver_cmd_wext.c

diff --git a/bcmdhd/wpa_supplicant_8_lib/driver_cmd_wext.c b/bcmdhd/wpa_supplicant_8_lib/driver_cmd_wext.c
index 70a8157..c6d5be7 100644
--- a/bcmdhd/wpa_supplicant_8_lib/driver_cmd_wext.c
+++ b/bcmdhd/wpa_supplicant_8_lib/driver_cmd_wext.c
@@ -74,7 +74,6 @@
 	struct iwreq iwr;
 	int ret, bp;
 	unsigned i;
-	struct wpa_supplicant *wpa_s = (struct wpa_supplicant *)(drv->ctx);
 
 	if (!drv->driver_is_started) {
 		wpa_printf(MSG_DEBUG, "%s: Driver stopped", __func__);