Просмотр исходного кода

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 <[email protected]>
(cherry picked from commit 3ec7f3a512a27f8ca6402954ad2a997176103b4b)
David Bauer 1 год назад
Родитель
Сommit
c06d4df974

+ 6 - 0
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 "$mcast_rate" ] && wpa_supplicant_add_rate mcval "$mcast_rate"
 	[ -n "$mesh_id" ] && ssid="$mesh_id"
 	[ -n "$mesh_id" ] && ssid="$mesh_id"
 
 
+	brstr=
+	for br in $basic_rate_list; do
+		wpa_supplicant_add_rate brstr "$br"
+	done
+
 	local prev
 	local prev
 	json_set_namespace wdev_uc prev
 	json_set_namespace wdev_uc prev
 
 
@@ -856,6 +861,7 @@ mac80211_setup_mesh() {
 	json_add_string freq "$freq"
 	json_add_string freq "$freq"
 	json_add_string htmode "$iw_htmode"
 	json_add_string htmode "$iw_htmode"
 	[ -n "$mcval" ] && json_add_string mcast-rate "$mcval"
 	[ -n "$mcval" ] && json_add_string mcast-rate "$mcval"
+	[ -n "$brstr" ] && json_add_string basic-rates "$brstr"
 	json_add_int beacon-interval "$beacon_int"
 	json_add_int beacon-interval "$beacon_int"
 	mac80211_add_mesh_params
 	mac80211_add_mesh_params
 
 

+ 1 - 1
package/network/config/wifi-scripts/files/usr/share/hostap/wdev.uc

@@ -45,7 +45,7 @@ function iface_start(wdev)
 		system(cmd);
 		system(cmd);
 	} else if (wdev.mode == "mesh") {
 	} else if (wdev.mode == "mesh") {
 		let cmd = [ "iw", "dev", ifname, "mesh", "join", wdev.ssid, "freq", wdev.freq, htmode ];
 		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])
 			if (wdev[key])
 				push(cmd, key, wdev[key]);
 				push(cmd, key, wdev[key]);
 		system(cmd);
 		system(cmd);