aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2100.c
diff options
context:
space:
mode:
authorHong Liu <hong.liu@intel.com>2005-08-25 05:45:49 -0400
committerJames Ketrenos <jketreno@linux.intel.com>2005-11-07 18:51:17 -0500
commit054b08d48464bfa8e5be69829b59bd599c5dcd72 (patch)
treec60cb9e8e0407d8b98572e933c5fd250a82e05ee /drivers/net/wireless/ipw2100.c
parent55135791819270a412dfb99f66301f02c72edadf (diff)
Don't set hardware WEP if we are actually using TKIP/AES.
Signed-off-by: Hong Liu <hong.liu@intel.com>
Diffstat (limited to 'drivers/net/wireless/ipw2100.c')
-rw-r--r--drivers/net/wireless/ipw2100.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index eaf47078ee56..83ba08c0c33c 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -5443,8 +5443,11 @@ static void shim__set_security(struct net_device *dev,
5443 else 5443 else
5444 memcpy(priv->ieee->sec.keys[i], sec->keys[i], 5444 memcpy(priv->ieee->sec.keys[i], sec->keys[i],
5445 sec->key_sizes[i]); 5445 sec->key_sizes[i]);
5446 priv->ieee->sec.flags |= (1 << i); 5446 if (sec->level == SEC_LEVEL_1) {
5447 priv->status |= STATUS_SECURITY_UPDATED; 5447 priv->ieee->sec.flags |= (1 << i);
5448 priv->status |= STATUS_SECURITY_UPDATED;
5449 } else
5450 priv->ieee->sec.flags &= ~(1 << i);
5448 } 5451 }
5449 } 5452 }
5450 5453