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

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

Don't set hardware WEP if we are actually using TKIP/AES.
Signed-off-by: N Hong Liu <hong.liu@intel.com>
054b08d4 · Hong Liu · James Ketrenos · 55135791 · 054b08d4
隐藏空白更改
内联并排

Showing with 5 addition and 2 deletion

drivers/net/wireless/ipw2100.c drivers/net/wireless/ipw2100.c +5 -2

未找到文件。
--- 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);
+			if (sec->level == SEC_LEVEL_1) {
-			priv->status |= STATUS_SECURITY_UPDATED;
+				priv->ieee->sec.flags |= (1 << i);
+				priv->status |= STATUS_SECURITY_UPDATED;
+			} else
+				priv->ieee->sec.flags &= ~(1 << i);
 		}
 	}