don't enable wpa if wep is set
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1289 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
a94afabd39
commit
1d19b2b457
|
@ -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 (!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));
|
||||
if (val && nvram_get(wl_var("wpa_psk"))) {
|
||||
val = 1;
|
||||
bcom_ioctl(skfd, ifname, WLC_SET_EAP_RESTRICT, &val, sizeof(val));
|
||||
}
|
||||
}
|
||||
|
||||
/* Set up afterburner */
|
||||
|
|
Loading…
Reference in New Issue