[openwrt/openwrt] hostapd: add support for custom per-BSS options

[LEDE Commits]

aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/22e568d0fe5d44246874d3300e7e714f7594c320

commit 22e568d0fe5d44246874d3300e7e714f7594c320
Author: Florian Beverborg <flo at beverb.org>
AuthorDate: Sat Nov 7 15:44:05 2020 +0100

    hostapd: add support for custom per-BSS options
    
    This adds an option "hostapd_bss_options" that does the same as
    "hostapd_options" but on a per-BSS level, instead of a per-device level.
    
    This can be used, for example, to configure different per-devce sae_passwords
    per BSS or to augment some of the existing per-BSS options.
    
    Signed-off-by: Florian Beverborg <flo at beverb.org>
    [remove whitespace errors, bump release]
    Signed-off-by: Paul Spooren <mail at aparcar.org>
---
 package/network/services/hostapd/Makefile         | 2 +-
 package/network/services/hostapd/files/hostapd.sh | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index deb1d565bb..f746f5455a 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
-PKG_RELEASE:=20
+PKG_RELEASE:=21
 
 PKG_SOURCE_URL:=http://w1.fi/hostap.git
 PKG_SOURCE_PROTO:=git
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index fc78e2fb90..80e1f7cedf 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -330,6 +330,8 @@ hostapd_common_add_bss_config() {
 
 	config_add_array airtime_sta_weight
 	config_add_int airtime_bss_weight airtime_bss_limit
+
+	config_add_array hostapd_bss_options
 }
 
 hostapd_set_vlan_file() {
@@ -940,6 +942,11 @@ hostapd_set_bss_options() {
 		json_for_each_item append_operator_icon operator_icon
 	fi
 
+	json_get_values opts hostapd_bss_options
+	for val in $opts; do
+		append bss_conf "$val" "$N"
+	done
+
 	bss_md5sum=$(echo $bss_conf | md5sum | cut -d" " -f1)
 	append bss_conf "config_id=$bss_md5sum" "$N"