Skip to content

Commit

Permalink
mac80211: set basic-rate for mesh interfaces
Browse files Browse the repository at this point in the history
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 <[email protected]>
(cherry picked from commit 3ec7f3a)
  • Loading branch information
blocktrron committed Jan 6, 2025
1 parent 0c52c9d commit c06d4df
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit c06d4df

Please sign in to comment.