OpenWrt – Rev 4

Subversion Repositories:
Rev:
--- a/src/ap/wps_hostapd.c
+++ b/src/ap/wps_hostapd.c
@@ -346,8 +346,7 @@ static int hapd_wps_reconfig_in_memory(s
                                bss->wpa_pairwise |= WPA_CIPHER_GCMP;
                        else
                                bss->wpa_pairwise |= WPA_CIPHER_CCMP;
-               }
-               if (cred->encr_type & WPS_ENCR_TKIP)
+               } else if (cred->encr_type & WPS_ENCR_TKIP)
                        bss->wpa_pairwise |= WPA_CIPHER_TKIP;
                bss->rsn_pairwise = bss->wpa_pairwise;
                bss->wpa_group = wpa_select_ap_group_cipher(bss->wpa,
@@ -1069,8 +1068,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) {
                        wps->encr_types |= WPS_ENCR_TKIP;
                        wps->encr_types_rsn |= WPS_ENCR_TKIP;
                }