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/032-mesh-implement-use-of-VHT20-config-in-mesh-mode.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/032-mesh-implement-use-of-VHT20-config-in-mesh-mode.patch')
-rw-r--r-- | package/network/services/hostapd/patches/032-mesh-implement-use-of-VHT20-config-in-mesh-mode.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/network/services/hostapd/patches/032-mesh-implement-use-of-VHT20-config-in-mesh-mode.patch b/package/network/services/hostapd/patches/032-mesh-implement-use-of-VHT20-config-in-mesh-mode.patch index bd28fb8..083bdfe 100644 --- a/package/network/services/hostapd/patches/032-mesh-implement-use-of-VHT20-config-in-mesh-mode.patch +++ b/package/network/services/hostapd/patches/032-mesh-implement-use-of-VHT20-config-in-mesh-mode.patch @@ -33,7 +33,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c -@@ -2117,9 +2117,15 @@ void ibss_mesh_setup_freq(struct wpa_sup +@@ -2144,9 +2144,15 @@ void ibss_mesh_setup_freq(struct wpa_sup if (!dfs_enabled) return; @@ -51,7 +51,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> #endif /* CONFIG_HT_OVERRIDES */ /* Check/setup HT40+/HT40- */ -@@ -2147,8 +2153,6 @@ void ibss_mesh_setup_freq(struct wpa_sup +@@ -2174,8 +2180,6 @@ void ibss_mesh_setup_freq(struct wpa_sup if (!dfs_enabled) return; @@ -60,7 +60,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> if (ht40 == -1) { if (!(pri_chan->flag & HOSTAPD_CHAN_HT40MINUS)) return; -@@ -2192,6 +2196,7 @@ void ibss_mesh_setup_freq(struct wpa_sup +@@ -2219,6 +2223,7 @@ void ibss_mesh_setup_freq(struct wpa_sup wpa_scan_results_free(scan_res); } @@ -68,7 +68,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> wpa_printf(MSG_DEBUG, "IBSS/mesh: setup freq channel %d, sec_channel_offset %d", freq->channel, freq->sec_channel_offset); -@@ -2287,7 +2292,10 @@ void ibss_mesh_setup_freq(struct wpa_sup +@@ -2314,7 +2319,10 @@ void ibss_mesh_setup_freq(struct wpa_sup } } else if (ssid->max_oper_chwidth == VHT_CHANWIDTH_USE_HT) { chwidth = VHT_CHANWIDTH_USE_HT; |