diff options
author | Daniel Golle <daniel@makrotopia.org> | 2018-05-31 00:10:49 +0200 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2018-05-31 00:38:16 +0200 |
commit | 78f1974bc565d7544589a49ad8efd92c4ddec5b3 (patch) | |
tree | 2ba738d93778958d880ed37896c2bb617f19b9e1 /package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch | |
parent | dad39249fb91d6f320256ac12944863f09bb2dc9 (diff) | |
download | upstream-78f1974bc565d7544589a49ad8efd92c4ddec5b3.tar.gz upstream-78f1974bc565d7544589a49ad8efd92c4ddec5b3.tar.bz2 upstream-78f1974bc565d7544589a49ad8efd92c4ddec5b3.zip |
hostapd: update packaging and patches
Clean up conflicts/provides/depends hell and add PROVIDES for
eapol-test variants while at it.
Update mesh-DFS patchset from Peter Oh to v5 (with local fixes) which
allows to drop two revert-patches for upstream commits which previously
were necessary to un-break mesh-DFS support.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
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.patch | 6 |
1 files changed, 3 insertions, 3 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 e46336c85c..81ad81c39a 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 @@ -140,7 +140,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org> /* Helper macros for network block parser */ #ifdef OFFSET -@@ -2281,6 +2373,8 @@ static const struct parse_data ssid_fiel +@@ -2282,6 +2374,8 @@ static const struct parse_data ssid_fiel { INT(ap_max_inactivity) }, { INT(dtim_period) }, { INT(beacon_int) }, @@ -162,7 +162,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org> #define DEFAULT_EAP_WORKAROUND ((unsigned int) -1) -@@ -749,6 +751,9 @@ struct wpa_ssid { +@@ -757,6 +759,9 @@ struct wpa_ssid { */ void *parent_cred; @@ -174,7 +174,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 -@@ -3034,6 +3034,12 @@ static void wpas_start_assoc_cb(struct w +@@ -3061,6 +3061,12 @@ static void wpas_start_assoc_cb(struct w params.beacon_int = ssid->beacon_int; else params.beacon_int = wpa_s->conf->beacon_int; |