mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-14 11:13:53 +02:00
d4d223edad
SVN-Revision: 31515
26 lines
838 B
Diff
26 lines
838 B
Diff
--- a/src/ap/wps_hostapd.c
|
|
+++ b/src/ap/wps_hostapd.c
|
|
@@ -856,11 +856,9 @@ int hostapd_init_wps(struct hostapd_data
|
|
|
|
if (conf->rsn_pairwise & WPA_CIPHER_CCMP)
|
|
wps->encr_types |= WPS_ENCR_AES;
|
|
- if (conf->rsn_pairwise & WPA_CIPHER_TKIP)
|
|
+ else if (conf->rsn_pairwise & WPA_CIPHER_TKIP)
|
|
wps->encr_types |= WPS_ENCR_TKIP;
|
|
- }
|
|
-
|
|
- if (conf->wpa & WPA_PROTO_WPA) {
|
|
+ } else if (conf->wpa & WPA_PROTO_WPA) {
|
|
if (conf->wpa_key_mgmt & WPA_KEY_MGMT_PSK)
|
|
wps->auth_types |= WPS_AUTH_WPAPSK;
|
|
if (conf->wpa_key_mgmt & WPA_KEY_MGMT_IEEE8021X)
|
|
@@ -868,7 +866,7 @@ int hostapd_init_wps(struct hostapd_data
|
|
|
|
if (conf->wpa_pairwise & WPA_CIPHER_CCMP)
|
|
wps->encr_types |= WPS_ENCR_AES;
|
|
- if (conf->wpa_pairwise & WPA_CIPHER_TKIP)
|
|
+ else if (conf->wpa_pairwise & WPA_CIPHER_TKIP)
|
|
wps->encr_types |= WPS_ENCR_TKIP;
|
|
}
|
|
|