From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 27 Jun 2005 09:21:48 +0000 (+0000)
Subject: don't enable wpa if wep is set
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b26cccd5b6fc8b7ca2cbc7c440487e120b2428a0;p=openwrt%2Fstaging%2Fzorun.git

don't enable wpa if wep is set

SVN-Revision: 1289
---

diff --git a/openwrt/package/wificonf/wificonf.c b/openwrt/package/wificonf/wificonf.c
index 8df932f1e2..4a5f2fc6cf 100644
--- a/openwrt/package/wificonf/wificonf.c
+++ b/openwrt/package/wificonf/wificonf.c
@@ -155,20 +155,22 @@ void setup_bcom(int skfd, char *ifname)
 
 	bcom_ioctl(skfd, ifname, WLC_DOWN, NULL, 0);
 	
-	/* Set up WPA */
-	if (nvram_match(wl_var("crypto"), "tkip"))
-		val = TKIP_ENABLED;
-	else if (nvram_match(wl_var("crypto"), "aes"))
-		val = AES_ENABLED;
-	else if (nvram_match(wl_var("crypto"), "tkip+aes"))
-		val = TKIP_ENABLED | AES_ENABLED;
-	else
-		val = 0;
-	bcom_ioctl(skfd, ifname, WLC_SET_WSEC, &val, sizeof(val));
-
-	if (val && nvram_get(wl_var("wpa_psk"))) {
-		val = 1;
-		bcom_ioctl(skfd, ifname, WLC_SET_EAP_RESTRICT, &val, sizeof(val));
+	if (!nvram_enabled(wl_var("wep"))) {
+		/* Set up WPA */
+		if (nvram_match(wl_var("crypto"), "tkip"))
+			val = TKIP_ENABLED;
+		else if (nvram_match(wl_var("crypto"), "aes"))
+			val = AES_ENABLED;
+		else if (nvram_match(wl_var("crypto"), "tkip+aes"))
+			val = TKIP_ENABLED | AES_ENABLED;
+		else
+			val = 0;
+		bcom_ioctl(skfd, ifname, WLC_SET_WSEC, &val, sizeof(val));
+
+		if (val && nvram_get(wl_var("wpa_psk"))) {
+			val = 1;
+			bcom_ioctl(skfd, ifname, WLC_SET_EAP_RESTRICT, &val, sizeof(val));
+		}
 	}
 
 	/* Set up afterburner */