aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd/patches/463-add-mcast_rate-to-11s.patch
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2020-05-21 10:15:46 +0100
committerDaniel Golle <daniel@makrotopia.org>2020-05-21 10:21:59 +0100
commit017320ead3a21415ab876012d1a2844e783c071f (patch)
tree55903a1a5033ec72527e62cf7f3a9c3d7e3aba1d /package/network/services/hostapd/patches/463-add-mcast_rate-to-11s.patch
parenta860fe2304c5c555af9113c93377ed7bb6e6abca (diff)
downloadupstream-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/463-add-mcast_rate-to-11s.patch')
-rw-r--r--package/network/services/hostapd/patches/463-add-mcast_rate-to-11s.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/network/services/hostapd/patches/463-add-mcast_rate-to-11s.patch b/package/network/services/hostapd/patches/463-add-mcast_rate-to-11s.patch
index 9ee60b1a63..473f3c786c 100644
--- a/package/network/services/hostapd/patches/463-add-mcast_rate-to-11s.patch
+++ b/package/network/services/hostapd/patches/463-add-mcast_rate-to-11s.patch
@@ -19,17 +19,17 @@ Tested-by: Simon Wunderlich <simon.wunderlich@openmesh.com>
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
-@@ -1546,6 +1546,7 @@ struct wpa_driver_mesh_join_params {
- #define WPA_DRIVER_MESH_FLAG_SAE_AUTH 0x00000004
+@@ -1549,6 +1549,7 @@ struct wpa_driver_mesh_join_params {
#define WPA_DRIVER_MESH_FLAG_AMPE 0x00000008
unsigned int flags;
+ u8 handle_dfs;
+ int mcast_rate;
};
struct wpa_driver_set_key_params {
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
-@@ -9959,6 +9959,18 @@ static int nl80211_put_mesh_id(struct nl
+@@ -10026,6 +10026,18 @@ static int nl80211_put_mesh_id(struct nl
}
@@ -48,7 +48,7 @@ Tested-by: Simon Wunderlich <simon.wunderlich@openmesh.com>
static int nl80211_put_mesh_config(struct nl_msg *msg,
struct wpa_driver_mesh_bss_params *params)
{
-@@ -10017,6 +10029,7 @@ static int nl80211_join_mesh(struct i802
+@@ -10087,6 +10099,7 @@ static int nl80211_join_mesh(struct i802
nl80211_put_basic_rates(msg, params->basic_rates) ||
nl80211_put_mesh_id(msg, params->meshid, params->meshid_len) ||
nl80211_put_beacon_int(msg, params->beacon_int) ||
@@ -58,7 +58,7 @@ Tested-by: Simon Wunderlich <simon.wunderlich@openmesh.com>
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
-@@ -460,6 +460,7 @@ int wpa_supplicant_join_mesh(struct wpa_
+@@ -501,6 +501,7 @@ int wpa_supplicant_join_mesh(struct wpa_
params->meshid = ssid->ssid;
params->meshid_len = ssid->ssid_len;