more wpa/wificonf fixes

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

diff --git a/package/wificonf/wificonf.c b/package/wificonf/wificonf.c
index 4a5f2fc..79606a8 100644 (file)
--- a/package/wificonf/wificonf.c
+++ b/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;