diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-01 01:59:15 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-01 01:59:15 -0500 |
| commit | 75e47b36004d136edff68295420424cba3a5ccd0 (patch) | |
| tree | 363c2bc1f8b5185b37f05106fec4ba2a07134182 /drivers/net/wireless/ipw2200.c | |
| parent | 68727fed5469100bec0764207d7efb7a9ecdee29 (diff) | |
| parent | 07981aa43f6aec32b875f360755ed3d14f9d5139 (diff) | |
| download | kernel-crypto-75e47b36004d136edff68295420424cba3a5ccd0.tar.gz kernel-crypto-75e47b36004d136edff68295420424cba3a5ccd0.tar.xz kernel-crypto-75e47b36004d136edff68295420424cba3a5ccd0.zip | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ipw2200.c')
| -rw-r--r-- | drivers/net/wireless/ipw2200.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 44024c76d18..ed37141319e 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c @@ -5533,8 +5533,8 @@ static int ipw_best_network(struct ipw_priv *priv, 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), @@ -7061,8 +7061,7 @@ static int ipw_associate_network(struct ipw_priv *priv, priv->assoc_request.auth_type = AUTH_SHARED_KEY; priv->assoc_request.auth_key = priv->ieee->sec.active_key; - if ((priv->ieee->sec.level == SEC_LEVEL_1) && - !(priv->ieee->host_encrypt || priv->ieee->host_decrypt)) + if (priv->ieee->sec.level == SEC_LEVEL_1) ipw_send_wep_keys(priv, DCW_WEP_KEY_SEC_TYPE_WEP); } else if ((priv->capability & CAP_PRIVACY_ON) && |