aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd/patches/031-mesh-add-VHT_CHANWIDTH_USE_HT-to-max_oper_chwidth.patch
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2018-05-12 21:08:18 +0200
committerDaniel Golle <daniel@makrotopia.org>2018-05-14 09:48:58 +0200
commit6e0fa4a76db667d7f0c1d84a3af5017df26d3fad (patch)
tree8f0767bc33a3dfd200cbdf64667015e138ed352c /package/network/services/hostapd/patches/031-mesh-add-VHT_CHANWIDTH_USE_HT-to-max_oper_chwidth.patch
parent6aaeec666d0af4240b1d61f5654d91a53cf35a82 (diff)
downloadupstream-6e0fa4a76db667d7f0c1d84a3af5017df26d3fad.tar.gz
upstream-6e0fa4a76db667d7f0c1d84a3af5017df26d3fad.tar.bz2
upstream-6e0fa4a76db667d7f0c1d84a3af5017df26d3fad.zip
hostapd: fix mesh+AP
Fix encrypted (or DFS) AP+MESH interface combination in a way similar to how it's done for AP+STA and fix netifd shell script. Refresh patches while at it. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package/network/services/hostapd/patches/031-mesh-add-VHT_CHANWIDTH_USE_HT-to-max_oper_chwidth.patch')
-rw-r--r--package/network/services/hostapd/patches/031-mesh-add-VHT_CHANWIDTH_USE_HT-to-max_oper_chwidth.patch13
1 files changed, 2 insertions, 11 deletions
diff --git a/package/network/services/hostapd/patches/031-mesh-add-VHT_CHANWIDTH_USE_HT-to-max_oper_chwidth.patch b/package/network/services/hostapd/patches/031-mesh-add-VHT_CHANWIDTH_USE_HT-to-max_oper_chwidth.patch
index 30003116e9..8ff11f3191 100644
--- a/package/network/services/hostapd/patches/031-mesh-add-VHT_CHANWIDTH_USE_HT-to-max_oper_chwidth.patch
+++ b/package/network/services/hostapd/patches/031-mesh-add-VHT_CHANWIDTH_USE_HT-to-max_oper_chwidth.patch
@@ -15,11 +15,9 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
wpa_supplicant/wpa_supplicant.c | 3 +++
3 files changed, 5 insertions(+)
-diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
-index f65bbb02f..7e8f014cc 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
-@@ -2798,6 +2798,7 @@ void wpa_config_set_network_defaults(struct wpa_ssid *ssid)
+@@ -2796,6 +2796,7 @@ void wpa_config_set_network_defaults(str
ssid->mka_priority = DEFAULT_PRIO_NOT_KEY_SERVER;
#endif /* CONFIG_MACSEC */
ssid->mac_addr = -1;
@@ -27,8 +25,6 @@ index f65bbb02f..7e8f014cc 100644
}
-diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h
-index 9fd56c32f..2ddb777b2 100644
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
@@ -37,6 +37,7 @@
@@ -39,11 +35,9 @@ index 9fd56c32f..2ddb777b2 100644
struct psk_list_entry {
struct dl_list list;
-diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
-index dcd787bec..ca893f942 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2293,6 +2293,9 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
+@@ -2285,6 +2285,9 @@ void ibss_mesh_setup_freq(struct wpa_sup
vht_caps |= VHT_CAP_SUPP_CHAN_WIDTH_160MHZ;
seg0 = 114;
}
@@ -53,6 +47,3 @@ index dcd787bec..ca893f942 100644
}
if (hostapd_set_freq_params(&vht_freq, mode->mode, freq->freq,
---
-2.17.0
-