---

yaml --- r: 13579 b: refs/heads/master c: 054b08d h: refs/heads/master i: 13577: 816eaa9 13575: 7888684 v: v3
git-mirror · Nov 7, 2005 · 79fdb9c · 79fdb9c
1 parent e76f0b2
commit 79fdb9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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);
 		}
 	}