diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2020-05-21 10:15:46 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2020-05-21 10:21:59 +0100 |
| commit | 017320ead3a21415ab876012d1a2844e783c071f (patch) | |
| tree | 55903a1a5033ec72527e62cf7f3a9c3d7e3aba1d /package/network/services/hostapd/patches/301-mesh-noscan.patch | |
| parent | a860fe2304c5c555af9113c93377ed7bb6e6abca (diff) | |
| download | upstream-017320ead3a21415ab876012d1a2844e783c071f.tar.gz upstream-017320ead3a21415ab876012d1a2844e783c071f.tar.bz2 upstream-017320ead3a21415ab876012d1a2844e783c071f.zip | |
hostapd: bring back mesh patches
Bring back 802.11s mesh features to the level previously available
before the recent hostapd version bump. This is mostly to support use
of 802.11s on DFS channels, but also making mesh forwarding
configurable which is crucial for use of 802.11s MAC with other routing
protocols, such as batman-adv, on top.
While at it, fix new compiler warning by adapting 700-wifi-reload.patch
to upstream changes, now building without any warnings again.
Fixes: 0a3ec87a66 ("hostapd: update to latest Git hostap_2_9-1238-gdd2daf0848ed")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package/network/services/hostapd/patches/301-mesh-noscan.patch')
| -rw-r--r-- | package/network/services/hostapd/patches/301-mesh-noscan.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/network/services/hostapd/patches/301-mesh-noscan.patch b/package/network/services/hostapd/patches/301-mesh-noscan.patch index a86070aa3a..33c481cc76 100644 --- a/package/network/services/hostapd/patches/301-mesh-noscan.patch +++ b/package/network/services/hostapd/patches/301-mesh-noscan.patch @@ -1,6 +1,6 @@ --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c -@@ -2477,6 +2477,7 @@ static const struct parse_data ssid_fiel +@@ -2478,6 +2478,7 @@ static const struct parse_data ssid_fiel #else /* CONFIG_MESH */ { INT_RANGE(mode, 0, 4) }, #endif /* CONFIG_MESH */ @@ -15,12 +15,12 @@ INT(mode); INT(no_auto_peer); + INT(noscan); + INT(mesh_fwding); INT(frequency); INT(enable_edmg); - INT(edmg_channel); --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c -@@ -333,6 +333,8 @@ static int wpa_supplicant_mesh_init(stru +@@ -368,6 +368,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 -@@ -2331,12 +2331,12 @@ void ibss_mesh_setup_freq(struct wpa_sup +@@ -2334,12 +2334,12 @@ void ibss_mesh_setup_freq(struct wpa_sup int ieee80211_mode = wpas_mode_to_ieee80211_mode(ssid->mode); 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; -@@ -2416,7 +2416,7 @@ void ibss_mesh_setup_freq(struct wpa_sup +@@ -2421,7 +2421,7 @@ void ibss_mesh_setup_freq(struct wpa_sup #endif /* CONFIG_HE_OVERRIDES */ /* Setup higher BW only for 5 GHz */ @@ -57,7 +57,7 @@ for (chan_idx = 0; chan_idx < mode->num_channels; chan_idx++) { --- a/wpa_supplicant/config_ssid.h +++ b/wpa_supplicant/config_ssid.h -@@ -960,6 +960,8 @@ struct wpa_ssid { +@@ -965,6 +965,8 @@ struct wpa_ssid { */ int no_auto_peer; |