developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 1 | diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh |
developer | 60cad40 | 2022-06-08 22:17:14 +0800 | [diff] [blame] | 2 | index 27eecf3..0124d89 100644 |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 3 | --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh |
| 4 | +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh |
developer | 60cad40 | 2022-06-08 22:17:14 +0800 | [diff] [blame] | 5 | @@ -61,7 +61,8 @@ drv_mac80211_init_device_config() { |
| 6 | rx_stbc \ |
| 7 | tx_stbc \ |
| 8 | he_bss_color \ |
| 9 | - he_spr_non_srg_obss_pd_max_offset |
| 10 | + he_spr_non_srg_obss_pd_max_offset \ |
| 11 | + radar_background |
| 12 | config_add_boolean \ |
| 13 | ldpc \ |
| 14 | greenfield \ |
| 15 | @@ -137,13 +138,10 @@ mac80211_hostapd_setup_base() { |
| 16 | [ -n "$acs_exclude_dfs" ] && [ "$acs_exclude_dfs" -gt 0 ] && |
| 17 | append base_cfg "acs_exclude_dfs=1" "$N" |
| 18 | |
| 19 | - json_get_vars noscan ht_coex |
| 20 | + json_get_vars noscan ht_coex radar_background:0 |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 21 | json_get_values ht_capab_list ht_capab tx_burst |
| 22 | json_get_values channel_list channels |
| 23 | |
| 24 | - [ "$auto_channel" = 0 ] && [ -z "$channel_list" ] && \ |
| 25 | - channel_list="$channel" |
| 26 | - |
| 27 | set_default noscan 0 |
| 28 | |
| 29 | [ "$noscan" -gt 0 ] && hostapd_noscan=1 |
developer | 60cad40 | 2022-06-08 22:17:14 +0800 | [diff] [blame] | 30 | @@ -413,9 +411,9 @@ mac80211_hostapd_setup_base() { |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 31 | he_spr_non_srg_obss_pd_max_offset:1 \ |
| 32 | he_bss_color |
| 33 | |
| 34 | - he_phy_cap=$(iw phy "$phy" info | awk -F "[()]" '/HE PHY Capabilities/ { print $2 }' | head -1) |
| 35 | + he_phy_cap=$(iw phy "$phy" info | grep "HE Iftypes: AP" -A 50 | awk -F "[()]" '/HE PHY Capabilities/ { print $2 }' | head -1) |
| 36 | he_phy_cap=${he_phy_cap:2} |
| 37 | - he_mac_cap=$(iw phy "$phy" info | awk -F "[()]" '/HE MAC Capabilities/ { print $2 }' | head -1) |
| 38 | + he_mac_cap=$(iw phy "$phy" info | grep "HE Iftypes: AP" -A 50 | awk -F "[()]" '/HE MAC Capabilities/ { print $2 }' | head -1) |
| 39 | he_mac_cap=${he_mac_cap:2} |
| 40 | |
| 41 | append base_cfg "ieee80211ax=1" "$N" |
developer | 60cad40 | 2022-06-08 22:17:14 +0800 | [diff] [blame] | 42 | @@ -462,6 +460,8 @@ mac80211_hostapd_setup_base() { |
| 43 | append base_cfg "he_mu_edca_ac_vo_timer=255" "$N" |
| 44 | fi |
| 45 | |
| 46 | + append base_cfg "enable_background_radar=$radar_background" "$N" |
| 47 | + |
| 48 | hostapd_prepare_device_config "$hostapd_conf_file" nl80211 |
| 49 | cat >> "$hostapd_conf_file" <<EOF |
| 50 | ${channel:+channel=$channel} |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 51 | -- |
| 52 | 2.29.2 |
| 53 | |