diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-06-27 09:21:48 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-06-27 09:21:48 +0000 |
| commit | 2c67854daa45a4cbf304663f368eeaeb128ca9bf (patch) | |
| tree | 2221e4f7b8891ef5564fe73cf01f20cbfdb41551 /openwrt | |
| parent | 8f8ea3a76e422bdc07c1b81cceec56fc1065496e (diff) | |
don't enable wpa if wep is set
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1289 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt')
| -rw-r--r-- | openwrt/package/wificonf/wificonf.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/openwrt/package/wificonf/wificonf.c b/openwrt/package/wificonf/wificonf.c index 8df932f1e..4a5f2fc6c 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 */ |