hostapd: update to latest Git hostap_2_9-1238-gdd2daf0848ed

[openwrt/staging/luka.git] / package / network / services / hostapd / patches / 400-wps_single_auth_enc_type.patch

diff --git a/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch b/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch
index 7f1986ec46e2a93b651a335fece21c61ec9d533b..73a8c7694d59dd60a9312d9823127b171016d264 100644 (file)
--- a/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch
+++ b/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch
@@ -1,22 +1,23 @@
 --- a/src/ap/wps_hostapd.c
 +++ b/src/ap/wps_hostapd.c
-@@ -346,8 +346,7 @@ static int hapd_wps_reconfig_in_memory(s
+@@ -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;
-               bss->wpa_group = wpa_select_ap_group_cipher(bss->wpa,
-@@ -1108,8 +1107,7 @@ int hostapd_init_wps(struct hostapd_data
+@@ -1178,8 +1177,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;
-               }
+ #ifdef CONFIG_NO_TKIP
+                       wpa_printf(MSG_INFO, "WPS: TKIP not supported");
+                       goto fail;