| --- a/src/ap/wps_hostapd.c |
| +++ b/src/ap/wps_hostapd.c |
| @@ -394,9 +394,8 @@ static int hapd_wps_reconfig_in_memory(s |
| bss->wpa_pairwise |= WPA_CIPHER_GCMP; |
| else |
| bss->wpa_pairwise |= WPA_CIPHER_CCMP; |
| - } |
| #ifndef CONFIG_NO_TKIP |
| - if (cred->encr_type & WPS_ENCR_TKIP) |
| + } else if (cred->encr_type & WPS_ENCR_TKIP) |
| bss->wpa_pairwise |= WPA_CIPHER_TKIP; |
| #endif /* CONFIG_NO_TKIP */ |
| bss->rsn_pairwise = bss->wpa_pairwise; |
| @@ -1181,8 +1180,7 @@ int hostapd_init_wps(struct hostapd_data |
| WPA_CIPHER_GCMP_256)) { |
| wps->encr_types |= WPS_ENCR_AES; |
| wps->encr_types_rsn |= WPS_ENCR_AES; |
| - } |
| - if (conf->rsn_pairwise & WPA_CIPHER_TKIP) { |
| + } else if (conf->rsn_pairwise & WPA_CIPHER_TKIP) { |
| #ifdef CONFIG_NO_TKIP |
| wpa_printf(MSG_INFO, "WPS: TKIP not supported"); |
| goto fail; |