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

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

diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index eaf47078ee564c7d1727c6674048ffbb26b30968..83ba08c0c33c6c958361777e01ea9c8e9ca098cd 100644 (file)
--- 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);
                }
        }