hostapd: add a new option to control HT coexistance separate from noscan

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 45873

diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index 23d2e7e83ebe5ca744f40e300fdbfb1014c555c5..3647b2907fe030ceb74bf59fbec4abe73f32c02b 100644 (file)
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -52,7 +52,7 @@ hostapd_common_add_device_config() {
        config_add_array supported_rates
 
        config_add_string country
-       config_add_boolean country_ie doth
+       config_add_boolean country_ie doth ht_coex
        config_add_string require_mode
 
        hostapd_add_log_config
@@ -65,13 +65,15 @@ hostapd_prepare_device_config() {
        local base="${config%%.conf}"
        local base_cfg=
 
-       json_get_vars country country_ie beacon_int doth require_mode
+       json_get_vars country country_ie beacon_int doth require_mode ht_coex
 
        hostapd_set_log_options base_cfg
 
        set_default country_ie 1
        set_default doth 1
+       set_default ht_coex 0
 
+       append base_cfg "ht_coex=$ht_coex" "$N"
        [ -n "$country" ] && {
                append base_cfg "country_code=$country" "$N"
 

diff --git a/package/network/services/hostapd/patches/300-noscan.patch b/package/network/services/hostapd/patches/300-noscan.patch
index 5b30abcc609c642f4177b9144bad5e9e3fa8544d..57d8fe27bf681638237e0e8452ec7fbdebe6d036 100644 (file)
--- a/package/network/services/hostapd/patches/300-noscan.patch
+++ b/package/network/services/hostapd/patches/300-noscan.patch
@@ -1,21 +1,24 @@
 --- a/hostapd/config_file.c
 +++ b/hostapd/config_file.c
-@@ -2771,6 +2771,8 @@ static int hostapd_config_fill(struct ho
+@@ -2771,6 +2771,10 @@ static int hostapd_config_fill(struct ho
                }
  #endif /* CONFIG_IEEE80211W */
  #ifdef CONFIG_IEEE80211N
 +      } else if (os_strcmp(buf, "noscan") == 0) {
 +              conf->noscan = atoi(pos);
++      } else if (os_strcmp(buf, "ht_coex") == 0) {
++              conf->no_ht_coex = !atoi(pos);
        } else if (os_strcmp(buf, "ieee80211n") == 0) {
                conf->ieee80211n = atoi(pos);
        } else if (os_strcmp(buf, "ht_capab") == 0) {
 --- a/src/ap/ap_config.h
 +++ b/src/ap/ap_config.h
-@@ -619,6 +619,7 @@ struct hostapd_config {
+@@ -619,6 +619,8 @@ struct hostapd_config {
  
        int ht_op_mode_fixed;
        u16 ht_capab;
 +      int noscan;
++      int no_ht_coex;
        int ieee80211n;
        int secondary_channel;
        int require_ht;
@@ -36,7 +39,7 @@
        if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET))
                return;
  
-+      if (iface->conf->noscan)
++      if (iface->conf->noscan || iface->conf->no_ht_coex)
 +              return;
 +
        if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie))
@@ -46,7 +49,7 @@
        if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
                return;
  
-+      if (iface->conf->noscan)
++      if (iface->conf->noscan || iface->conf->no_ht_coex)
 +              return;
 +
        wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR