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>

1 files changed, 10 insertions, 20 deletions

diff --git a/package/network/services/hostapd/patches/301-mesh-noscan.patch b/package/network/services/hostapd/patches/301-mesh-noscan.patch
index 09b67a392b..b2c59bc5be 100644
--- a/package/network/services/hostapd/patches/301-mesh-noscan.patch
+++ b/package/network/services/hostapd/patches/301-mesh-noscan.patch
@@ -1,7 +1,5 @@
-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
+--- a/wpa_supplicant/config.c
++++ b/wpa_supplicant/config.c
 @@ -2216,6 +2216,7 @@ static const struct parse_data ssid_fiel
  #else /* CONFIG_MESH */
  	{ INT_RANGE(mode, 0, 4) },
@@ -10,10 +8,8 @@ Index: hostapd-2018-04-09-fa617ee6/wpa_supplicant/config.c
  	{ 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
+--- a/wpa_supplicant/config_file.c
++++ b/wpa_supplicant/config_file.c
 @@ -816,6 +816,7 @@ static void wpa_config_write_network(FIL
  #endif /* IEEE8021X_EAPOL */
  	INT(mode);
@@ -22,10 +18,8 @@ Index: hostapd-2018-04-09-fa617ee6/wpa_supplicant/config_file.c
  	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
+--- a/wpa_supplicant/mesh.c
++++ b/wpa_supplicant/mesh.c
 @@ -287,6 +287,8 @@ static int wpa_supplicant_mesh_init(stru
  			   frequency);
  		goto out_free;
@@ -35,10 +29,8 @@ Index: hostapd-2018-04-09-fa617ee6/wpa_supplicant/mesh.c
  	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
+--- a/wpa_supplicant/wpa_supplicant.c
++++ b/wpa_supplicant/wpa_supplicant.c
 @@ -2024,12 +2024,12 @@ void ibss_mesh_setup_freq(struct wpa_sup
  {
  	enum hostapd_hw_mode hw_mode;
@@ -63,10 +55,8 @@ Index: hostapd-2018-04-09-fa617ee6/wpa_supplicant/wpa_supplicant.c
  		return;
  
  	for (chan_idx = 0; chan_idx < mode->num_channels; chan_idx++) {
-Index: hostapd-2018-04-09-fa617ee6/wpa_supplicant/config_ssid.h
-===================================================================
---- hostapd-2018-04-09-fa617ee6.orig/wpa_supplicant/config_ssid.h
-+++ hostapd-2018-04-09-fa617ee6/wpa_supplicant/config_ssid.h
+--- a/wpa_supplicant/config_ssid.h
++++ b/wpa_supplicant/config_ssid.h
 @@ -835,6 +835,8 @@ struct wpa_ssid {
  	 */
  	int no_auto_peer;