aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorZhu Yi <yi.zhu@intel.com>2006-02-16 18:46:16 -0500
committerJohn W. Linville <linville@tuxdriver.com>2006-03-17 15:08:03 -0500
commit8da374fc44a5e0fb71a485497cae38eb562d078c (patch)
tree48bec1c7d8f0a2c7bc0ac7e1b5cef5fa3c9a2f6d /drivers/net
parentb191608a451e75ed7f979cac268f5f423176feb3 (diff)
[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: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ipw2200.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index c38d6a5fe9a3..dfa2efb3e215 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -5527,15 +5527,6 @@ static int ipw_best_network(struct ipw_priv *priv,
5527 return 0; 5527 return 0;
5528 } 5528 }
5529 5529
5530 if (priv->ieee->wpa_enabled &&
5531 network->wpa_ie_len == 0 && network->rsn_ie_len == 0) {
5532 IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
5533 "because of WPA capability mismatch.\n",
5534 escape_essid(network->ssid, network->ssid_len),
5535 MAC_ARG(network->bssid));
5536 return 0;
5537 }
5538
5539 if ((priv->config & CFG_STATIC_BSSID) && 5530 if ((priv->config & CFG_STATIC_BSSID) &&
5540 memcmp(network->bssid, priv->bssid, ETH_ALEN)) { 5531 memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
5541 IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded " 5532 IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "