From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 1 Jul 2005 22:52:05 +0000 (+0000)
Subject: more wpa/wificonf fixes
X-Git-Url: http://git.rohieb.name/openwrt.git/commitdiff_plain/f76b9a917c1ca0af6c80ec71ac0f7328ec574e29

more wpa/wificonf fixes


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1311 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/openwrt/package/wificonf/wificonf.c b/openwrt/package/wificonf/wificonf.c
index 4a5f2fc6c..79606a895 100644
--- a/openwrt/package/wificonf/wificonf.c
+++ b/openwrt/package/wificonf/wificonf.c
@@ -155,7 +155,7 @@ void setup_bcom(int skfd, char *ifname)
 
 	bcom_ioctl(skfd, ifname, WLC_DOWN, NULL, 0);
 	
-	if (!nvram_enabled(wl_var("wep"))) {
+	if (nvram_match(wl_var("auth_mode"), "wpa") || nvram_match(wl_var("auth_mode"), "psk") || (nvram_get(wl_var("akm")) && !nvram_disabled(wl_var("akm")))) {
 		/* Set up WPA */
 		if (nvram_match(wl_var("crypto"), "tkip"))
 			val = TKIP_ENABLED;