hostapd: update to version 2013-11-20

[openwrt/svn-archive/archive.git] / package / network / services / hostapd / patches / 530-wps_single_auth_enc_type.patch

diff --git a/package/network/services/hostapd/patches/530-wps_single_auth_enc_type.patch b/package/network/services/hostapd/patches/530-wps_single_auth_enc_type.patch
deleted file mode 100644 (file)
index 6f4a655..0000000
--- a/package/network/services/hostapd/patches/530-wps_single_auth_enc_type.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/ap/wps_hostapd.c
-+++ b/src/ap/wps_hostapd.c
-@@ -989,11 +989,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)
-@@ -1001,7 +999,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;
-       }
-