wext: Do not set SSID on disconnect on Android
authorDmitry Shmidt <dimitrysh@google.com>
Fri, 21 Oct 2011 16:11:07 +0000 (19:11 +0300)
committerJouni Malinen <j@w1.fi>
Fri, 21 Oct 2011 16:11:07 +0000 (19:11 +0300)
Some drivers seem to try to associate using the random SSID, so
do not use this hack on Android.

src/drivers/driver_wext.c

index 6f58175..7c383f3 100644 (file)
@@ -1824,8 +1824,10 @@ static void wpa_driver_wext_disconnect(struct wpa_driver_wext_data *drv)
 {
        struct iwreq iwr;
        const u8 null_bssid[ETH_ALEN] = { 0, 0, 0, 0, 0, 0 };
+#ifndef ANDROID
        u8 ssid[32];
        int i;
+#endif /* ANDROID */
 
        /*
         * Only force-disconnect when the card is in infrastructure mode,
@@ -1846,6 +1848,7 @@ static void wpa_driver_wext_disconnect(struct wpa_driver_wext_data *drv)
                                   "selection on disconnect");
                }
 
+#ifndef ANDROID
                if (drv->cfg80211) {
                        /*
                         * cfg80211 supports SIOCSIWMLME commands, so there is
@@ -1871,6 +1874,7 @@ static void wpa_driver_wext_disconnect(struct wpa_driver_wext_data *drv)
                        wpa_printf(MSG_DEBUG, "WEXT: Failed to set bogus "
                                   "SSID to disconnect");
                }
+#endif /* ANDROID */
        }
 }