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/004-mesh-use-setup-completion-callback-to-complete-mesh-.patch | |
| parent | dad39249fb91d6f320256ac12944863f09bb2dc9 (diff) | |
| download | mtk-20170518-78f1974bc565d7544589a49ad8efd92c4ddec5b3.zip mtk-20170518-78f1974bc565d7544589a49ad8efd92c4ddec5b3.tar.gz mtk-20170518-78f1974bc565d7544589a49ad8efd92c4ddec5b3.tar.bz2 | |
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/004-mesh-use-setup-completion-callback-to-complete-mesh-.patch')
| -rw-r--r-- | package/network/services/hostapd/patches/004-mesh-use-setup-completion-callback-to-complete-mesh-.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/network/services/hostapd/patches/004-mesh-use-setup-completion-callback-to-complete-mesh-.patch b/package/network/services/hostapd/patches/004-mesh-use-setup-completion-callback-to-complete-mesh-.patch index 14e1832..3ce2848 100644 --- a/package/network/services/hostapd/patches/004-mesh-use-setup-completion-callback-to-complete-mesh-.patch +++ b/package/network/services/hostapd/patches/004-mesh-use-setup-completion-callback-to-complete-mesh-.patch @@ -1,7 +1,7 @@ -From 32044a7bb26858bedaf147c77f49f5cef1133de3 Mon Sep 17 00:00:00 2001 +From bd05de484bfa61def530d717c7234381f6b33cf7 Mon Sep 17 00:00:00 2001 From: Peter Oh <peter.oh@bowerswilkins.com> -Date: Tue, 17 Apr 2018 21:55:01 -0700 -Subject: [PATCH 04/16] mesh: use setup completion callback to complete mesh +Date: Tue, 29 May 2018 14:39:08 -0700 +Subject: [PATCH 04/18] mesh: use setup completion callback to complete mesh join mesh join function is the last function to be called during @@ -32,7 +32,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> ifmsh->drv_flags = wpa_s->drv_flags; ifmsh->num_bss = 1; ifmsh->bss = os_calloc(wpa_s->ifmsh->num_bss, -@@ -233,6 +234,8 @@ static int wpa_supplicant_mesh_init(stru +@@ -234,6 +235,8 @@ static int wpa_supplicant_mesh_init(stru bss->drv_priv = wpa_s->drv_priv; bss->iface = ifmsh; bss->mesh_sta_free_cb = mesh_mpm_free_sta; @@ -41,7 +41,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> frequency = ssid->frequency; if (frequency != freq->freq && frequency == freq->freq + freq->sec_channel_offset * 20) { -@@ -374,8 +377,9 @@ void wpa_supplicant_mesh_add_scan_ie(str +@@ -375,8 +378,9 @@ void wpa_supplicant_mesh_add_scan_ie(str } @@ -52,7 +52,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> struct wpa_driver_mesh_join_params *params = wpa_s->mesh_params; struct wpa_ssid *ssid = wpa_s->current_ssid; int ret = 0; -@@ -497,7 +501,6 @@ int wpa_supplicant_join_mesh(struct wpa_ +@@ -498,7 +502,6 @@ int wpa_supplicant_join_mesh(struct wpa_ goto out; } |