diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-03-27 10:42:47 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-03-27 10:42:47 +0000 |
commit | 4225e4b2d8fe131d93df97916b77910c0906c1ad (patch) | |
tree | 52a27698f502489b680f8bdca34d9df20b95d8a6 /package/hostapd/patches/530-wps_single_auth_enc_type.patch | |
parent | 35607da5b8150cb2d10e0e5e9c521f19ca47f677 (diff) | |
download | upstream-4225e4b2d8fe131d93df97916b77910c0906c1ad.tar.gz upstream-4225e4b2d8fe131d93df97916b77910c0906c1ad.tar.bz2 upstream-4225e4b2d8fe131d93df97916b77910c0906c1ad.zip |
hostapd: update to 20120326
SVN-Revision: 31080
Diffstat (limited to 'package/hostapd/patches/530-wps_single_auth_enc_type.patch')
-rw-r--r-- | package/hostapd/patches/530-wps_single_auth_enc_type.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/package/hostapd/patches/530-wps_single_auth_enc_type.patch b/package/hostapd/patches/530-wps_single_auth_enc_type.patch new file mode 100644 index 0000000000..e75f30cf6b --- /dev/null +++ b/package/hostapd/patches/530-wps_single_auth_enc_type.patch @@ -0,0 +1,25 @@ +--- a/src/ap/wps_hostapd.c ++++ b/src/ap/wps_hostapd.c +@@ -855,11 +855,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) +@@ -867,7 +865,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; + } + |