hostapd: add wmm qos map set by default

[openwrt/staging/thess.git] / package / network / services / hostapd / files / hostapd.sh

diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 7d035a299bf9d693323651421088ec90fc98a5f8..b4aa5e4c853bb749b294d9447a80abe7557a3945 100644 (file)
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -753,7 +753,8 @@ hostapd_set_bss_options() {
        }
 
        append bss_conf "ssid=$ssid" "$N"
-       [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge" "$N"
+       [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge${N}wds_bridge=" "$N"
+       [ -n "$network_ifname" ] && append bss_conf "snoop_iface=$network_ifname" "$N"
        [ -n "$iapp_interface" ] && {
                local ifname
                network_get_device ifname "$iapp_interface" || ifname="$iapp_interface"
@@ -972,7 +973,6 @@ hostapd_set_bss_options() {
                [ -n "$iw_network_auth_type" ] && \
                        append bss_conf "network_auth_type=$iw_network_auth_type" "$N"
                [ -n "$iw_gas_address3" ] && append bss_conf "gas_address3=$iw_gas_address3" "$N"
-               [ -n "$iw_qos_map_set" ] && append bss_conf "qos_map_set=$iw_qos_map_set" "$N"
 
                json_for_each_item append_iw_roaming_consortium iw_roaming_consortium
                json_for_each_item append_iw_anqp_elem iw_anqp_elem
@@ -991,6 +991,12 @@ hostapd_set_bss_options() {
                        append bss_conf "anqp_3gpp_cell_net=$iw_anqp_3gpp_cell_net_conf" "$N"
        fi
 
+       set_default iw_qos_map_set 0,0,2,16,1,1,255,255,18,22,24,38,40,40,44,46,48,56
+       case "$iw_qos_map_set" in
+               *,*);;
+               *) iw_qos_map_set="";;
+       esac
+       [ -n "$iw_qos_map_set" ] && append bss_conf "qos_map_set=$iw_qos_map_set" "$N"
 
        local hs20 disable_dgaf osen anqp_domain_id hs20_deauth_req_timeout \
                osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp \
@@ -1165,8 +1171,8 @@ wpa_supplicant_set_fixed_freq() {
        append network_data "frequency=$freq" "$N$T"
        case "$htmode" in
                NOHT) append network_data "disable_ht=1" "$N$T";;
-               HT20|VHT20) append network_data "disable_ht40=1" "$N$T";;
-               HT40*|VHT40*|VHT80*|VHT160*) append network_data "ht40=1" "$N$T";;
+               HE20|HT20|VHT20) append network_data "disable_ht40=1" "$N$T";;
+               HT40*|VHT40|VHT80|VHT160|HE40|HE80|HE160) append network_data "ht40=1" "$N$T";;
        esac
        case "$htmode" in
                VHT*) append network_data "vht=1" "$N$T";;