[][MAC80211][hostapd][Add interworking uci config]
[Description]
Add interworking uci config
[Release-log]
N/A
Change-Id: Ic0f0332d393954b4f970029d0ae1d7087d4d8b0c
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7538987
diff --git a/autobuild_mac80211_release/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch b/autobuild_mac80211_release/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch
index 94b3b0d..f08cfd7 100644
--- a/autobuild_mac80211_release/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch
+++ b/autobuild_mac80211_release/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch
@@ -1,5 +1,5 @@
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
-index 225649d..8a51567 100644
+index a7472ee779..f06c889b0a 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -20,6 +20,7 @@ PKG_SOURCE:=backports-$(PKG_VERSION).tar.xz
@@ -31,7 +31,7 @@
$(PKG_BUILD_DIR)/include/linux/ssb \
$(PKG_BUILD_DIR)/include/linux/bcma \
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
-index 5aaba9a..2ea3e7c 100644
+index 5aaba9af26..2ea3e7c955 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -27,6 +27,7 @@ drv_mac80211_init_device_config() {
@@ -430,7 +430,7 @@
ret="$?"
[ "$ret" != 0 -o -z "$hostapd_res" ] && {
diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
-index e24a2a6..f685162 100644
+index e24a2a634e..f68516211e 100644
--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
@@ -60,6 +60,9 @@ BEGIN {
@@ -556,7 +556,7 @@
done
}
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
-index 28bd210..167cc0b 100644
+index 28bd210623..0f914a4dfd 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -376,6 +376,13 @@ hostapd_common_add_bss_config() {
@@ -569,10 +569,24 @@
+ config_add_int disable_vht
+ config_add_int disable_ht
+
-+ config_add_boolean beacon_prot
++ config_add_boolean beacon_prot interworking
}
hostapd_set_vlan_file() {
+@@ -440,11 +447,11 @@ append_iw_nai_realm() {
+ }
+
+ append_iw_venue_name() {
+- append bss_conf "venue_name=$1" "$N"
++ [ -n "$1" ] && append bss_conf "venue_name=$1" "$N"
+ }
+
+ append_iw_venue_url() {
+- append bss_conf "venue_url=$1" "$N"
++ [ -n "$1" ] && append bss_conf "venue_url=$1" "$N"
+ }
+
+ append_hs20_oper_friendly_name() {
@@ -841,7 +848,7 @@ hostapd_set_bss_options() {
}
@@ -600,7 +614,19 @@
[ -n "$ieee80211w_max_timeout" ] && \
append bss_conf "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N"
[ -n "$ieee80211w_retry_timeout" ] && \
-@@ -1559,6 +1568,20 @@ wpa_supplicant_add_network() {
+@@ -1047,9 +1056,10 @@ hostapd_set_bss_options() {
+ json_get_vars iw_roaming_consortium iw_domain_name iw_anqp_3gpp_cell_net iw_nai_realm
+ json_get_vars iw_anqp_elem iw_qos_map_set iw_ipaddr_type_availability iw_gas_address3
+ json_get_vars iw_venue_name iw_venue_url
++ json_get_vars interworking
+
+ set_default iw_enabled 0
+- if [ "$iw_enabled" = "1" ]; then
++ if [ "$iw_enabled" = "1" ] || [ "$interworking" = "1" ]; then
+ append bss_conf "interworking=1" "$N"
+ set_default iw_internet 1
+ set_default iw_asra 0
+@@ -1559,6 +1569,20 @@ wpa_supplicant_add_network() {
[ -n "$bssid_blacklist" ] && append network_data "bssid_blacklist=$bssid_blacklist" "$N$T"
[ -n "$bssid_whitelist" ] && append network_data "bssid_whitelist=$bssid_whitelist" "$N$T"
@@ -621,7 +647,7 @@
[ -n "$basic_rate" ] && {
local br rate_list=
for br in $basic_rate; do
-@@ -1573,6 +1596,11 @@ wpa_supplicant_add_network() {
+@@ -1573,6 +1597,11 @@ wpa_supplicant_add_network() {
append network_data "mcast_rate=$mc_rate" "$N$T"
}