aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorDavid Bauer <mail@david-bauer.net>2024-12-22 02:56:12 +0100
committerDavid Bauer <mail@david-bauer.net>2025-01-06 07:45:08 +0100
commitc06d4df9748aea84b9a4ffcbe51b2e6fff94de1e (patch)
treef26d8288a18c76a20be2799929261662b4c0a966 /package
parent0c52c9d6fc53ebe0834b3945c5d58277752d9648 (diff)
downloadupstream-c06d4df9748aea84b9a4ffcbe51b2e6fff94de1e.tar.gz
upstream-c06d4df9748aea84b9a4ffcbe51b2e6fff94de1e.tar.bz2
upstream-c06d4df9748aea84b9a4ffcbe51b2e6fff94de1e.zip
mac80211: set basic-rate for mesh interfaces
Basic rates were not set for mesh-interfaces, resulting in the undesired behavior where 11s frames might be sent with a rate which was not configured. Depending on the driver, the basic rate might also be used to determine the beacon rate configured to the chip. One such example are MediaTek MT7915 platforms. Signed-off-by: David Bauer <mail@david-bauer.net> (cherry picked from commit 3ec7f3a512a27f8ca6402954ad2a997176103b4b)
Diffstat (limited to 'package')
-rwxr-xr-xpackage/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh6
-rw-r--r--package/network/config/wifi-scripts/files/usr/share/hostap/wdev.uc2
2 files changed, 7 insertions, 1 deletions
diff --git a/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh b/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
index 42d7bc66d00..368885246a7 100755
--- a/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
+++ b/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
@@ -846,6 +846,11 @@ mac80211_setup_mesh() {
[ -n "$mcast_rate" ] && wpa_supplicant_add_rate mcval "$mcast_rate"
[ -n "$mesh_id" ] && ssid="$mesh_id"
+ brstr=
+ for br in $basic_rate_list; do
+ wpa_supplicant_add_rate brstr "$br"
+ done
+
local prev
json_set_namespace wdev_uc prev
@@ -856,6 +861,7 @@ mac80211_setup_mesh() {
json_add_string freq "$freq"
json_add_string htmode "$iw_htmode"
[ -n "$mcval" ] && json_add_string mcast-rate "$mcval"
+ [ -n "$brstr" ] && json_add_string basic-rates "$brstr"
json_add_int beacon-interval "$beacon_int"
mac80211_add_mesh_params
diff --git a/package/network/config/wifi-scripts/files/usr/share/hostap/wdev.uc b/package/network/config/wifi-scripts/files/usr/share/hostap/wdev.uc
index d836a930fc4..166e9403dfc 100644
--- a/package/network/config/wifi-scripts/files/usr/share/hostap/wdev.uc
+++ b/package/network/config/wifi-scripts/files/usr/share/hostap/wdev.uc
@@ -45,7 +45,7 @@ function iface_start(wdev)
system(cmd);
} else if (wdev.mode == "mesh") {
let cmd = [ "iw", "dev", ifname, "mesh", "join", wdev.ssid, "freq", wdev.freq, htmode ];
- for (let key in [ "mcast-rate", "beacon-interval" ])
+ for (let key in [ "basic-rates", "mcast-rate", "beacon-interval" ])
if (wdev[key])
push(cmd, key, wdev[key]);
system(cmd);