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/001-mesh-factor-out-mesh-join-function.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/001-mesh-factor-out-mesh-join-function.patch')
| -rw-r--r-- | package/network/services/hostapd/patches/001-mesh-factor-out-mesh-join-function.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/network/services/hostapd/patches/001-mesh-factor-out-mesh-join-function.patch b/package/network/services/hostapd/patches/001-mesh-factor-out-mesh-join-function.patch index e6278676f0..a1d668b283 100644 --- a/package/network/services/hostapd/patches/001-mesh-factor-out-mesh-join-function.patch +++ b/package/network/services/hostapd/patches/001-mesh-factor-out-mesh-join-function.patch @@ -1,7 +1,7 @@ -From 032e70833de4b251fc4a159b2cc4ef28d0f1df0d Mon Sep 17 00:00:00 2001 +From 02ae4382f45f772e3630460459eb4e5af64e71b4 Mon Sep 17 00:00:00 2001 From: Peter Oh <peter.oh@bowerswilkins.com> -Date: Tue, 17 Apr 2018 21:54:58 -0700 -Subject: [PATCH 01/16] mesh: factor out mesh join function +Date: Tue, 29 May 2018 14:39:05 -0700 +Subject: [PATCH 01/18] mesh: factor out mesh join function mesh join function consitss of 2 parts which are preparing configurations and sending join event to driver. @@ -19,7 +19,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c -@@ -363,13 +363,48 @@ void wpa_supplicant_mesh_add_scan_ie(str +@@ -364,13 +364,48 @@ void wpa_supplicant_mesh_add_scan_ie(str } @@ -70,7 +70,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> ret = -ENOENT; goto out; } -@@ -380,22 +415,22 @@ int wpa_supplicant_join_mesh(struct wpa_ +@@ -381,22 +416,22 @@ int wpa_supplicant_join_mesh(struct wpa_ wpa_s->group_cipher = WPA_CIPHER_NONE; wpa_s->mgmt_group_cipher = 0; @@ -104,7 +104,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> } else { ssid->max_oper_chwidth = VHT_CHANWIDTH_80MHZ; } -@@ -409,67 +444,43 @@ int wpa_supplicant_join_mesh(struct wpa_ +@@ -410,67 +445,43 @@ int wpa_supplicant_join_mesh(struct wpa_ } } if (ssid->beacon_int > 0) |