diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-26 23:33:47 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-26 23:33:47 +0000 |
| commit | 0be32368ad57192f5b92c96f61021b6d8752469e (patch) | |
| tree | ee4cc1f042906b1a41b1102091ca342dab62a191 /package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch | |
| parent | d82b57a74f46f61ae387a344926100d61ec72d93 (diff) | |
| download | master-187ad058-0be32368ad57192f5b92c96f61021b6d8752469e.tar.gz master-187ad058-0be32368ad57192f5b92c96f61021b6d8752469e.tar.bz2 master-187ad058-0be32368ad57192f5b92c96f61021b6d8752469e.zip | |
hostapd: update hostapd to 2015-03-25
madwifi was dropped upstream, can't find it anywhere in OpenWrt
either, thus finally burrying madwifi.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45045 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch')
| -rw-r--r-- | package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 8dae52b277..083af5b450 100644 --- 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,8 +1,8 @@ --- a/src/ap/wps_hostapd.c +++ b/src/ap/wps_hostapd.c -@@ -1051,11 +1051,9 @@ int hostapd_init_wps(struct hostapd_data +@@ -1052,11 +1052,9 @@ int hostapd_init_wps(struct hostapd_data - if (conf->rsn_pairwise & WPA_CIPHER_CCMP) + if (conf->rsn_pairwise & (WPA_CIPHER_CCMP | WPA_CIPHER_GCMP)) wps->encr_types |= WPS_ENCR_AES; - if (conf->rsn_pairwise & WPA_CIPHER_TKIP) + else if (conf->rsn_pairwise & WPA_CIPHER_TKIP) @@ -14,7 +14,7 @@ if (conf->wpa_key_mgmt & WPA_KEY_MGMT_PSK) wps->auth_types |= WPS_AUTH_WPAPSK; if (conf->wpa_key_mgmt & WPA_KEY_MGMT_IEEE8021X) -@@ -1063,7 +1061,7 @@ int hostapd_init_wps(struct hostapd_data +@@ -1064,7 +1062,7 @@ int hostapd_init_wps(struct hostapd_data if (conf->wpa_pairwise & WPA_CIPHER_CCMP) wps->encr_types |= WPS_ENCR_AES; |