enable driver-internal supplicant only in wet mode and set psk2 mode if configured

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

diff --git a/openwrt/package/wificonf/wificonf.c b/openwrt/package/wificonf/wificonf.c
index 1867ed0..1ca1e5e 100644 (file)
--- a/openwrt/package/wificonf/wificonf.c
+++ b/openwrt/package/wificonf/wificonf.c
@@ -406,14 +406,13 @@ static void setup_bcom(int skfd, char *ifname)
                bcom_ioctl(skfd, ifname, WLC_SET_WSEC, &val, sizeof(val));
 
                if (val && strstr(v, "psk")) {
                bcom_ioctl(skfd, ifname, WLC_SET_WSEC, &val, sizeof(val));
 
                if (val && strstr(v, "psk")) {

+                       val = (strstr(v, "psk2") ? 0x84 : 0x4);

                        v = nvram_safe_get(wl_var("wpa_psk"));
                        v = nvram_safe_get(wl_var("wpa_psk"));

-

                        if ((strlen(v) >= 8) && (strlen(v) < 63)) {
                        if ((strlen(v) >= 8) && (strlen(v) < 63)) {

-                               val = 4;
+                               

                                bcom_ioctl(skfd, ifname, WLC_SET_WPA_AUTH, &val, sizeof(val));
                                
                                bcom_ioctl(skfd, ifname, WLC_SET_WPA_AUTH, &val, sizeof(val));
                                

-                               bcom_ioctl(skfd, ifname, WLC_GET_AP, &val, sizeof(val));
-                               if (!val) {
+                               if (!nvram_match(wl_var("mode"), "wet")) {

                                        /* Enable in-driver WPA supplicant */
                                        wsec_pmk_t pmk;
                                        
                                        /* Enable in-driver WPA supplicant */
                                        wsec_pmk_t pmk;