diff options
author | Felix Fietkau <nbd@nbd.name> | 2018-04-20 10:35:51 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2018-04-20 10:36:42 +0200 |
commit | 1a895479576de36e8adbed9cd1e0d2a14c004802 (patch) | |
tree | 71bc6ac3ce00c0661dffb0210e13dadb9d61cb52 /package/network/services/hostapd/patches/301-mesh-noscan.patch | |
parent | d92ec071b211e0ee17496287f62652beb7db543d (diff) | |
download | upstream-1a895479576de36e8adbed9cd1e0d2a14c004802.tar.gz upstream-1a895479576de36e8adbed9cd1e0d2a14c004802.tar.bz2 upstream-1a895479576de36e8adbed9cd1e0d2a14c004802.zip |
Revert "hostapd: fix encrypted mesh channel settings"
This reverts commit 7f52919a2f2894125b4dca611eb2d30181af7e0b, which is
currently breaking the builds and needs to be reworked
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/network/services/hostapd/patches/301-mesh-noscan.patch')
-rw-r--r-- | package/network/services/hostapd/patches/301-mesh-noscan.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/package/network/services/hostapd/patches/301-mesh-noscan.patch b/package/network/services/hostapd/patches/301-mesh-noscan.patch deleted file mode 100644 index 5a51474b9c..0000000000 --- a/package/network/services/hostapd/patches/301-mesh-noscan.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: hostapd-2018-04-09-fa617ee6/wpa_supplicant/config.c -=================================================================== ---- hostapd-2018-04-09-fa617ee6.orig/wpa_supplicant/config.c -+++ hostapd-2018-04-09-fa617ee6/wpa_supplicant/config.c -@@ -2216,6 +2216,7 @@ static const struct parse_data ssid_fiel - #else /* CONFIG_MESH */ - { INT_RANGE(mode, 0, 4) }, - #endif /* CONFIG_MESH */ -+ { INT_RANGE(noscan, 0, 1) }, - { INT_RANGE(proactive_key_caching, 0, 1) }, - { INT_RANGE(disabled, 0, 2) }, - { STR(id_str) }, -Index: hostapd-2018-04-09-fa617ee6/wpa_supplicant/config_file.c -=================================================================== ---- hostapd-2018-04-09-fa617ee6.orig/wpa_supplicant/config_file.c -+++ hostapd-2018-04-09-fa617ee6/wpa_supplicant/config_file.c -@@ -816,6 +816,7 @@ static void wpa_config_write_network(FIL - #endif /* IEEE8021X_EAPOL */ - INT(mode); - INT(no_auto_peer); -+ INT(noscan); - INT(mesh_fwding); - INT(frequency); - INT(fixed_freq); -Index: hostapd-2018-04-09-fa617ee6/wpa_supplicant/mesh.c -=================================================================== ---- hostapd-2018-04-09-fa617ee6.orig/wpa_supplicant/mesh.c -+++ hostapd-2018-04-09-fa617ee6/wpa_supplicant/mesh.c -@@ -287,6 +287,8 @@ static int wpa_supplicant_mesh_init(stru - frequency); - goto out_free; - } -+ if (ssid->noscan) -+ conf->noscan = 1; - if (ssid->ht40) - conf->secondary_channel = ssid->ht40; - if (conf->hw_mode == HOSTAPD_MODE_IEEE80211A && ssid->vht) { -Index: hostapd-2018-04-09-fa617ee6/wpa_supplicant/wpa_supplicant.c -=================================================================== ---- hostapd-2018-04-09-fa617ee6.orig/wpa_supplicant/wpa_supplicant.c -+++ hostapd-2018-04-09-fa617ee6/wpa_supplicant/wpa_supplicant.c -@@ -2024,12 +2024,12 @@ void ibss_mesh_setup_freq(struct wpa_sup - { - enum hostapd_hw_mode hw_mode; - struct hostapd_hw_modes *mode = NULL; -- int ht40plus[] = { 36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157, -+ int ht40plus[] = { 1, 2, 3, 4, 5, 6, 36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157, - 184, 192 }; - int vht80[] = { 36, 52, 100, 116, 132, 149 }; - struct hostapd_channel_data *pri_chan = NULL, *sec_chan = NULL; - u8 channel; -- int i, chan_idx, ht40 = -1, res, obss_scan = 1; -+ int i, chan_idx, ht40 = -1, res, obss_scan = !(ssid->noscan); - unsigned int j, k; - struct hostapd_freq_params vht_freq; - int chwidth, seg0, seg1; -@@ -2099,7 +2099,7 @@ void ibss_mesh_setup_freq(struct wpa_sup - return; - - /* Setup higher BW only for 5 GHz */ -- if (mode->mode != HOSTAPD_MODE_IEEE80211A) -+ if (mode->mode != HOSTAPD_MODE_IEEE80211A && !(ssid->noscan)) - return; - - for (chan_idx = 0; chan_idx < mode->num_channels; chan_idx++) { |