From 79fdb9c4cab6b7a90d859332c203e3ecf7c8a6b6 Mon Sep 17 00:00:00 2001 From: Hong Liu Date: Thu, 25 Aug 2005 17:45:49 +0800 Subject: [PATCH] --- yaml --- r: 13579 b: refs/heads/master c: 054b08d48464bfa8e5be69829b59bd599c5dcd72 h: refs/heads/master i: 13577: 816eaa9cbea636e2fbcda091a75f865b74424cc9 13575: 78886847c2f95384ef28b12b5fe3cffa68b9a2a3 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ipw2100.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c603a682181a..ed4fd7a72ef9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55135791819270a412dfb99f66301f02c72edadf +refs/heads/master: 054b08d48464bfa8e5be69829b59bd599c5dcd72 diff --git a/trunk/drivers/net/wireless/ipw2100.c b/trunk/drivers/net/wireless/ipw2100.c index eaf47078ee56..83ba08c0c33c 100644 --- a/trunk/drivers/net/wireless/ipw2100.c +++ b/trunk/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); } }