OpenWrt – Rev 1

Subversion Repositories:
Rev:
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -2233,6 +2233,7 @@ static const struct parse_data ssid_fiel
 #else /* CONFIG_MESH */
        { INT_RANGE(mode, 0, 4) },
 #endif /* CONFIG_MESH */
+       { INT_RANGE(noscan, 0, 1) },
        { INT_RANGE(proactive_key_caching, 0, 1) },
        { INT_RANGE(disabled, 0, 2) },
        { STR(id_str) },
--- a/wpa_supplicant/config_file.c
+++ b/wpa_supplicant/config_file.c
@@ -818,6 +818,7 @@ static void wpa_config_write_network(FIL
 #endif /* IEEE8021X_EAPOL */
        INT(mode);
        INT(no_auto_peer);
+       INT(noscan);
        INT(mesh_fwding);
        INT(frequency);
        INT(fixed_freq);
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
@@ -288,6 +288,8 @@ static int wpa_supplicant_mesh_init(stru
                           frequency);
                goto out_free;
        }
+       if (ssid->noscan)
+               conf->noscan = 1;
        if (ssid->ht40)
                conf->secondary_channel = ssid->ht40;
        if (conf->hw_mode == HOSTAPD_MODE_IEEE80211A && ssid->vht) {
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -2081,12 +2081,12 @@ void ibss_mesh_setup_freq(struct wpa_sup
 {
        enum hostapd_hw_mode hw_mode;
        struct hostapd_hw_modes *mode = NULL;
-       int ht40plus[] = { 36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157,
+       int ht40plus[] = { 1, 2, 3, 4, 5, 6, 36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157,
                           184, 192 };
        int vht80[] = { 36, 52, 100, 116, 132, 149 };
        struct hostapd_channel_data *pri_chan = NULL, *sec_chan = NULL;
        u8 channel;
-       int i, chan_idx, ht40 = -1, res, obss_scan = 1;
+       int i, chan_idx, ht40 = -1, res, obss_scan = !(ssid->noscan);
        unsigned int j, k;
        struct hostapd_freq_params vht_freq;
        int chwidth, seg0, seg1;
@@ -2156,7 +2156,7 @@ void ibss_mesh_setup_freq(struct wpa_sup
                return;
 
        /* Setup higher BW only for 5 GHz */
-       if (mode->mode != HOSTAPD_MODE_IEEE80211A)
+       if (mode->mode != HOSTAPD_MODE_IEEE80211A && !(ssid->noscan))
                return;
 
        for (chan_idx = 0; chan_idx < mode->num_channels; chan_idx++) {
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
@@ -856,6 +856,8 @@ struct wpa_ssid {
         */
        int no_auto_peer;
 
+       int noscan;
+
        /**
         * mesh_rssi_threshold - Set mesh parameter mesh_rssi_threshold (dBm)
         *