summaryrefslogtreecommitdiffstats
path: root/openwrt/package
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-11-13 14:41:06 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-11-13 14:41:06 +0000
commita17b0c2a27f70b31f8e7427a318c61e5d3afb6ec (patch)
tree0b0d81954a3f0aff198955cbde392196253171c7 /openwrt/package
parent1d37ae18e238000645f60a907609481c18ca7a6b (diff)
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
Diffstat (limited to 'openwrt/package')
-rw-r--r--openwrt/package/wificonf/wificonf.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/openwrt/package/wificonf/wificonf.c b/openwrt/package/wificonf/wificonf.c
index 1867ed03f..1ca1e5eb5 100644
--- 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")) {
+ val = (strstr(v, "psk2") ? 0x84 : 0x4);
v = nvram_safe_get(wl_var("wpa_psk"));
-
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_GET_AP, &val, sizeof(val));
- if (!val) {
+ if (!nvram_match(wl_var("mode"), "wet")) {
/* Enable in-driver WPA supplicant */
wsec_pmk_t pmk;