aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-28 17:19:13 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-28 17:19:13 +0000
commit924407b253fdf22ab27e72ae38b4d9513d0191c8 (patch)
tree2dcdb54af5ac6763a0a5edd0de0548eaeda26690 /package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
parent705ddc9bb944a7ab6ba338984718de2416849a6c (diff)
downloadupstream-924407b253fdf22ab27e72ae38b4d9513d0191c8.tar.gz
upstream-924407b253fdf22ab27e72ae38b4d9513d0191c8.tar.bz2
upstream-924407b253fdf22ab27e72ae38b4d9513d0191c8.zip
hostapd: update to version 2016-01-15
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48527
Diffstat (limited to 'package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch')
-rw-r--r--package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch b/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
index 217e701501..426ffc5148 100644
--- a/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
+++ b/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
@@ -20,9 +20,9 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
+#include "drivers/nl80211_copy.h"
#include "common/defs.h"
+ #include "common/ieee802_11_defs.h"
#include "utils/list.h"
-
-@@ -538,6 +539,9 @@ struct wpa_driver_associate_params {
+@@ -570,6 +571,9 @@ struct wpa_driver_associate_params {
* responsible for selecting with which BSS to associate. */
const u8 *bssid;
@@ -34,15 +34,15 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
*
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
-@@ -15,6 +15,7 @@
- #include "rsn_supp/wpa.h"
+@@ -16,6 +16,7 @@
#include "eap_peer/eap.h"
#include "p2p/p2p.h"
+ #include "fst/fst.h"
+#include "drivers/nl80211_copy.h"
#include "config.h"
-@@ -1722,6 +1723,97 @@ static char * wpa_config_write_mesh_basi
+@@ -1742,6 +1743,97 @@ static char * wpa_config_write_mesh_basi
#endif /* CONFIG_MESH */
@@ -140,7 +140,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
/* Helper macros for network block parser */
#ifdef OFFSET
-@@ -1947,6 +2039,9 @@ static const struct parse_data ssid_fiel
+@@ -1973,6 +2065,9 @@ static const struct parse_data ssid_fiel
{ INT(ap_max_inactivity) },
{ INT(dtim_period) },
{ INT(beacon_int) },
@@ -158,9 +158,9 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
#include "eap_peer/eap_config.h"
+#include "drivers/nl80211_copy.h"
- #define MAX_SSID_LEN 32
-@@ -675,6 +676,9 @@ struct wpa_ssid {
+ #define DEFAULT_EAP_WORKAROUND ((unsigned int) -1)
+@@ -698,6 +699,9 @@ struct wpa_ssid {
*/
void *parent_cred;
@@ -172,7 +172,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
* macsec_policy - Determines the policy for MACsec secure session
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2266,6 +2266,13 @@ static void wpas_start_assoc_cb(struct w
+@@ -2421,6 +2421,13 @@ static void wpas_start_assoc_cb(struct w
params.beacon_int = ssid->beacon_int;
else
params.beacon_int = wpa_s->conf->beacon_int;