mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 23:42:43 +00:00
34705946e2
Drop outdated and by now broken patchset originally supplied by Peter Oh in August 2018 but never merged upstream. Instead add the more promissing rework recently submitted by Markus Theil who picked up Peter's patchset, fixed and completed it and added support for HE (802.11ax) in mesh mode. This is only compile tested and needs some real-life testing. Fixes: FS#3214 Fixes:167028b750("hostapd: Update to version 2.9 (2019-08-08)") Fixes:0a3ec87a66("hostapd: update to latest Git hostap_2_9-1238-gdd2daf0848ed") Fixes:017320ead3("hostapd: bring back mesh patches") Signed-off-by: Daniel Golle <daniel@makrotopia.org>
69 lines
2.4 KiB
Diff
69 lines
2.4 KiB
Diff
From: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
|
Date: Thu, 11 May 2017 08:21:45 +0200
|
|
Subject: [PATCH] set mcast_rate in mesh mode
|
|
|
|
The wpa_supplicant code for IBSS allows to set the mcast rate. It is
|
|
recommended to increase this value from 1 or 6 Mbit/s to something higher
|
|
when using a mesh protocol on top which uses the multicast packet loss as
|
|
indicator for the link quality.
|
|
|
|
This setting was unfortunately not applied for mesh mode. But it would be
|
|
beneficial when wpa_supplicant would behave similar to IBSS mode and set
|
|
this argument during mesh join like authsae already does. At least it is
|
|
helpful for companies/projects which are currently switching to 802.11s
|
|
(without mesh_fwding and with mesh_ttl set to 1) as replacement for IBSS
|
|
because newer drivers seem to support 802.11s but not IBSS anymore.
|
|
|
|
Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
|
Tested-by: Simon Wunderlich <simon.wunderlich@openmesh.com>
|
|
|
|
--- a/src/drivers/driver.h
|
|
+++ b/src/drivers/driver.h
|
|
@@ -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
|
|
@@ -10043,6 +10043,18 @@ static int nl80211_put_mesh_id(struct nl
|
|
}
|
|
|
|
|
|
+static int nl80211_put_mcast_rate(struct nl_msg *msg, int mcast_rate)
|
|
+{
|
|
+ if (mcast_rate > 0) {
|
|
+ wpa_printf(MSG_DEBUG, " * mcast_rate=%.1f",
|
|
+ (double)mcast_rate / 10);
|
|
+ return nla_put_u32(msg, NL80211_ATTR_MCAST_RATE, mcast_rate);
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+
|
|
static int nl80211_put_mesh_config(struct nl_msg *msg,
|
|
struct wpa_driver_mesh_bss_params *params)
|
|
{
|
|
@@ -10104,6 +10116,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) ||
|
|
+ nl80211_put_mcast_rate(msg, params->mcast_rate) ||
|
|
nl80211_put_dtim_period(msg, params->dtim_period))
|
|
goto fail;
|
|
|
|
--- a/wpa_supplicant/mesh.c
|
|
+++ b/wpa_supplicant/mesh.c
|
|
@@ -592,6 +592,7 @@ int wpa_supplicant_join_mesh(struct wpa_
|
|
|
|
params->meshid = ssid->ssid;
|
|
params->meshid_len = ssid->ssid_len;
|
|
+ params->mcast_rate = ssid->mcast_rate;
|
|
ibss_mesh_setup_freq(wpa_s, ssid, ¶ms->freq);
|
|
wpa_s->mesh_ht_enabled = !!params->freq.ht_enabled;
|
|
wpa_s->mesh_vht_enabled = !!params->freq.vht_enabled;
|