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/011-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.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/011-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch')
-rw-r--r-- | package/network/services/hostapd/patches/011-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/network/services/hostapd/patches/011-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch b/package/network/services/hostapd/patches/011-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch index dfd85f1..8f2f6a7 100644 --- a/package/network/services/hostapd/patches/011-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch +++ b/package/network/services/hostapd/patches/011-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch @@ -1,7 +1,7 @@ -From ce3e491e445ebea9705e76ac7ee3d4841ace1cad Mon Sep 17 00:00:00 2001 +From bbaa6142eadf229334436fdbf51aa65bb819f771 Mon Sep 17 00:00:00 2001 From: Peter Oh <peter.oh@bowerswilkins.com> -Date: Tue, 17 Apr 2018 21:55:08 -0700 -Subject: [PATCH 11/16] mesh: Allow DFS channels to be selected if dfs is +Date: Tue, 29 May 2018 14:39:15 -0700 +Subject: [PATCH 11/18] mesh: Allow DFS channels to be selected if dfs is enabled Note: DFS is assumed to be usable if a country code has been set @@ -14,7 +14,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c -@@ -2033,6 +2033,8 @@ void ibss_mesh_setup_freq(struct wpa_sup +@@ -2060,6 +2060,8 @@ void ibss_mesh_setup_freq(struct wpa_sup struct hostapd_freq_params vht_freq; int chwidth, seg0, seg1; u32 vht_caps = 0; @@ -23,7 +23,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> freq->freq = ssid->frequency; -@@ -2109,8 +2111,11 @@ void ibss_mesh_setup_freq(struct wpa_sup +@@ -2136,8 +2138,11 @@ void ibss_mesh_setup_freq(struct wpa_sup return; /* Check primary channel flags */ @@ -36,7 +36,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> #ifdef CONFIG_HT_OVERRIDES if (ssid->disable_ht40) -@@ -2136,8 +2141,11 @@ void ibss_mesh_setup_freq(struct wpa_sup +@@ -2163,8 +2168,11 @@ void ibss_mesh_setup_freq(struct wpa_sup return; /* Check secondary channel flags */ @@ -49,7 +49,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> freq->channel = pri_chan->chan; -@@ -2227,8 +2235,11 @@ void ibss_mesh_setup_freq(struct wpa_sup +@@ -2254,8 +2262,11 @@ void ibss_mesh_setup_freq(struct wpa_sup return; /* Back to HT configuration if channel not usable */ @@ -62,7 +62,7 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com> } chwidth = VHT_CHANWIDTH_80MHZ; -@@ -2248,10 +2259,11 @@ void ibss_mesh_setup_freq(struct wpa_sup +@@ -2275,10 +2286,11 @@ void ibss_mesh_setup_freq(struct wpa_sup if (!chan) continue; |