diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2018-05-31 00:10:49 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-12-18 09:05:58 +0100 |
| commit | 000a3fef0ad9c0f0bcea0a9981c7700d66a97ab8 (patch) | |
| tree | 8a85305e20e0ea79f04a1afe12b075924d717123 /package/network/services/hostapd/patches/301-mesh-noscan.patch | |
| parent | 0d08c6705864d0ad430dc3d7049b51bf5a218ba7 (diff) | |
| download | upstream-000a3fef0ad9c0f0bcea0a9981c7700d66a97ab8.tar.gz upstream-000a3fef0ad9c0f0bcea0a9981c7700d66a97ab8.tar.bz2 upstream-000a3fef0ad9c0f0bcea0a9981c7700d66a97ab8.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>
(backported from 78f1974bc565d7544589a49ad8efd92c4ddec5b3)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/network/services/hostapd/patches/301-mesh-noscan.patch')
| -rw-r--r-- | package/network/services/hostapd/patches/301-mesh-noscan.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/network/services/hostapd/patches/301-mesh-noscan.patch b/package/network/services/hostapd/patches/301-mesh-noscan.patch index c72d5e115c..0c42d2b110 100644 --- a/package/network/services/hostapd/patches/301-mesh-noscan.patch +++ b/package/network/services/hostapd/patches/301-mesh-noscan.patch @@ -20,7 +20,7 @@ INT(fixed_freq); --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c -@@ -287,6 +287,8 @@ static int wpa_supplicant_mesh_init(stru +@@ -288,6 +288,8 @@ static int wpa_supplicant_mesh_init(stru frequency); goto out_free; } @@ -31,7 +31,7 @@ if (conf->hw_mode == HOSTAPD_MODE_IEEE80211A && ssid->vht) { --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c -@@ -2031,12 +2031,12 @@ void ibss_mesh_setup_freq(struct wpa_sup +@@ -2051,12 +2051,12 @@ void ibss_mesh_setup_freq(struct wpa_sup { enum hostapd_hw_mode hw_mode; struct hostapd_hw_modes *mode = NULL; @@ -46,7 +46,7 @@ unsigned int j, k; struct hostapd_freq_params vht_freq; int chwidth, seg0, seg1; -@@ -2106,7 +2106,7 @@ void ibss_mesh_setup_freq(struct wpa_sup +@@ -2126,7 +2126,7 @@ void ibss_mesh_setup_freq(struct wpa_sup return; /* Setup higher BW only for 5 GHz */ |