Commit cdd1fa1e authored by Hong Liu's avatar Hong Liu Committed by James Ketrenos

Card with WEP enabled and using shared-key auth will have firmware

error when it tries to auth to a WPA ap. The patch filters out WPA
networks if the card is not wpa enabled when selecting network to
associate to.
Signed-off-by: default avatarHong Liu <hong.liu@intel.com>
parent 567deaf6
...@@ -5510,6 +5510,15 @@ static int ipw_best_network(struct ipw_priv *priv, ...@@ -5510,6 +5510,15 @@ 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 "
...@@ -6228,6 +6237,7 @@ static int ipw_wpa_enable(struct ipw_priv *priv, int value) ...@@ -6228,6 +6237,7 @@ static int ipw_wpa_enable(struct ipw_priv *priv, int value)
{ {
/* This is called when wpa_supplicant loads and closes the driver /* This is called when wpa_supplicant loads and closes the driver
* interface. */ * interface. */
priv->ieee->wpa_enabled = value;
return 0; return 0;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment