From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/net/wireless/ipw2200.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/net/wireless/ipw2200.c~revert-ipw2200-Fix-WPA-network-selection-problem drivers/net/wireless/ipw2200.c --- devel/drivers/net/wireless/ipw2200.c~revert-ipw2200-Fix-WPA-network-selection-problem 2006-03-11 02:45:43.000000000 -0800 +++ devel-akpm/drivers/net/wireless/ipw2200.c 2006-03-11 02:45:43.000000000 -0800 @@ -5533,8 +5533,8 @@ static int ipw_best_network(struct ipw_p return 0; } - if (priv->ieee->wpa_enabled && - network->wpa_ie_len == 0 && network->rsn_ie_len == 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), _