diff options
| author | Hong Liu <hong.liu@intel.com> | 2005-08-25 17:45:49 +0800 |
|---|---|---|
| committer | James Ketrenos <jketreno@linux.intel.com> | 2005-11-07 17:51:17 -0600 |
| commit | 054b08d48464bfa8e5be69829b59bd599c5dcd72 (patch) | |
| tree | c60cb9e8e0407d8b98572e933c5fd250a82e05ee /drivers/net | |
| parent | 55135791819270a412dfb99f66301f02c72edadf (diff) | |
| download | blackbird-op-linux-054b08d48464bfa8e5be69829b59bd599c5dcd72.tar.gz blackbird-op-linux-054b08d48464bfa8e5be69829b59bd599c5dcd72.zip | |
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')
| -rw-r--r-- | drivers/net/wireless/ipw2100.c | 7 |
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, else memcpy(priv->ieee->sec.keys[i], sec->keys[i], sec->key_sizes[i]); - priv->ieee->sec.flags |= (1 << i); - priv->status |= STATUS_SECURITY_UPDATED; + if (sec->level == SEC_LEVEL_1) { + priv->ieee->sec.flags |= (1 << i); + priv->status |= STATUS_SECURITY_UPDATED; + } else + priv->ieee->sec.flags &= ~(1 << i); } } |
