domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi-scripts: add macaddr_base wifi-device option

Browse Source 
This can be used to configure the base mac address from which all
interface mac addresses are derived

Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit 00860e485b)
This commit is contained in:
Felix Fietkau
2024-12-09 20:09:15 +01:00
parent e20047e5d4
commit ea80aa938f
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
View File

@@ -30,6 +30,7 @@ drv_mac80211_init_device_config() {
config_add_string tx_burst
config_add_string distance
config_add_string ifname_prefix
config_add_string macaddr_base
config_add_int radio beacon_int chanbw frag rts
config_add_int rxantenna txantenna txpower min_tx_power
config_add_int num_global_macaddr multiple_bssid
@@ -530,6 +531,7 @@ ${hostapd_noscan:+noscan=1}
${tx_burst:+tx_queue_data2_burst=$tx_burst}
${multiple_bssid:+mbssid=$multiple_bssid}
#num_global_macaddr=$num_global_macaddr
#macaddr_base=$macaddr_base
$base_cfg
EOF
@@ -577,7 +579,7 @@ mac80211_generate_mac() {
local phy="$1"
local id="${macidx:-0}"
wdev_tool "$phy$phy_suffix" get_macaddr id=$id num_global=$num_global_macaddr mbssid=${multiple_bssid:-0}
wdev_tool "$phy$phy_suffix" get_macaddr id=$id num_global=$num_global_macaddr mbssid=${multiple_bssid:-0} macaddr_base=${macaddr_base}
}
get_board_phy_name() (
@@ -945,6 +947,7 @@ wpa_supplicant_set_config() {
json_add_string phy "$phy"
json_add_int radio "$radio"
json_add_int num_global_macaddr "$num_global_macaddr"
json_add_string macaddr_base "$macaddr_base"
json_add_boolean defer 1
local data="$(json_dump)"
@@ -991,7 +994,7 @@ wpa_supplicant_start() {
[ -n "$wpa_supp_init" ] || return 0
ubus_call wpa_supplicant config_set '{ "phy": "'"$phy"'", "radio": '"$radio"', "num_global_macaddr": '"$num_global_macaddr"' }' > /dev/null
ubus_call wpa_supplicant config_set '{ "phy": "'"$phy"'", "radio": '"$radio"', "num_global_macaddr": '"$num_global_macaddr"', "macaddr_base": "'"$macaddr_base"'" }' > /dev/null
}
mac80211_setup_supplicant() {
@@ -1118,7 +1121,7 @@ drv_mac80211_setup() {
rxantenna txantenna \
frag rts beacon_int:100 htmode \
num_global_macaddr:1 multiple_bssid \
ifname_prefix
ifname_prefix macaddr_base
json_get_values basic_rate_list basic_rate
json_get_values scan_list scan_list
json_select ..

4
package/network/config/wifi-scripts/files/usr/share/hostap/common.uc
View File

@@ -213,7 +213,9 @@ const phy_proto = {
if (!base_mask)
return null;
if (base_mask == "00:00:00:00:00:00" &&
if (data.macaddr_base)
base_addr = data.macaddr_base;
else if (base_mask == "00:00:00:00:00:00" &&
(radio_idx > 0 || idx >= num_global)) {
let addrs = split(phy_sysfs_file(phy, "addresses"), "\n");