commit 054b08d48464bfa8e5be69829b59bd599c5dcd72
author Hong Liu <hong.liu@intel.com> Thu Aug 25 17:45:49 2005 +0800
committer James Ketrenos <jketreno@linux.intel.com> Mon Nov 07 17:51:17 2005 -0600
tree c60cb9e8e0407d8b98572e933c5fd250a82e05ee
parent 55135791819270a412dfb99f66301f02c72edadf

Don't set hardware WEP if we are actually using TKIP/AES.

Signed-off-by: Hong Liu <hong.liu@intel.com>

drivers/net/wireless/ipw2100.c

diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index eaf4707..83ba08c 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -5443,8 +5443,11 @@
 			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);
 		}
 	}