summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2023-09-13 11:00:53 +0200
committerFelix Fietkau <nbd@nbd.name>2023-09-13 17:38:25 +0200
commit02b4dc93b61ab01c5a535b1a5440f732d6931dca (patch)
treeb51aac28084f7e2c5ff94d4e38b26ac4531c357d
parent7365e8f1bb5eb4c4fc6b8a03e0f7bed2c7b7b523 (diff)
downloadopenwrt-02b4dc93b61ab01c5a535b1a5440f732d6931dca.tar.gz
openwrt-02b4dc93b61ab01c5a535b1a5440f732d6931dca.tar.bz2
openwrt-02b4dc93b61ab01c5a535b1a5440f732d6931dca.zip
mac80211: only add the mbssid option to the config when set
This avoids errors when the feature is not built into the hostapd binary Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index 7d3ab4dc01..860609305f 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -488,7 +488,7 @@ ${channel:+channel=$channel}
${channel_list:+chanlist=$channel_list}
${hostapd_noscan:+noscan=1}
${tx_burst:+tx_queue_data2_burst=$tx_burst}
-mbssid=$multiple_bssid
+${multiple_bssid:+mbssid=$multiple_bssid}
#num_global_macaddr=$num_global_macaddr
$base_cfg
@@ -537,7 +537,7 @@ mac80211_generate_mac() {
local phy="$1"
local id="${macidx:-0}"
- wdev_tool "$phy" get_macaddr id=$id num_global=$num_global_macaddr mbssid=$multiple_bssid
+ wdev_tool "$phy" get_macaddr id=$id num_global=$num_global_macaddr mbssid=${multiple_bssid:-0}
}
get_board_phy_name() (
@@ -1049,7 +1049,7 @@ drv_mac80211_setup() {
txpower \
rxantenna txantenna \
frag rts beacon_int:100 htmode \
- num_global_macaddr:1 multiple_bssid:0
+ num_global_macaddr:1 multiple_bssid
json_get_values basic_rate_list basic_rate
json_get_values scan_list scan_list
json_select ..