Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8da374fc authored by Zhu Yi's avatar Zhu Yi Committed by John W. Linville
Browse files

[PATCH] ipw2200: remove the WPA card associates to non-WPA AP checking 



wpa_supplicant needs to set wpa_enabled unconditionally, with this check
it hasn't been possible to connect to non-WPA networks using wpa_supplicant.
So remove below check.

if (priv->ieee->wpa_enabled &&
	network->wpa_ie_len == 0 && network->rsn_ie_len == 0)

Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b191608a

drivers/net/wireless/ipw2200.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -5527,15 +5527,6 @@ static int ipw_best_network(struct ipw_priv *priv, 
		return 0;

		return 0;

	}

	}





	if (priv->ieee->wpa_enabled &&

	    network->wpa_ie_len == 0 && network->rsn_ie_len == 0) {

		IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "

				"because of WPA capability mismatch.\n",

				escape_essid(network->ssid, network->ssid_len),

				MAC_ARG(network->bssid));

		return 0;

	}



	if ((priv->config & CFG_STATIC_BSSID) &&

	if ((priv->config & CFG_STATIC_BSSID) &&

	    memcmp(network->bssid, priv->bssid, ETH_ALEN)) {

	    memcmp(network->bssid, priv->bssid, ETH_ALEN)) {

		IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "

		IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "