DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Allow HT40 also on 2.4GHz if noscan option is set, which also skips secondary channel scan just like noscan works in AP mode.

Browse source
This commit is contained in:
Daniel Golle 2018-04-20 07:41:03 +02:00 • committed by sinavir
parent 498f318216
commit 9f19475170
No known key found for this signature in database
5 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wpa_supplicant/config.c
View file

@ -2639,6 +2639,7 @@ static const struct parse_data ssid_fields[] = {
#else /* CONFIG_MESH */ #else /* CONFIG_MESH */
{ INT_RANGE(mode, 0, 4) }, { INT_RANGE(mode, 0, 4) },
#endif /* CONFIG_MESH */ #endif /* CONFIG_MESH */
{ INT_RANGE(noscan, 0, 1) },
{ INT_RANGE(proactive_key_caching, 0, 1) }, { INT_RANGE(proactive_key_caching, 0, 1) },
{ INT_RANGE(disabled, 0, 2) }, { INT_RANGE(disabled, 0, 2) },
{ STR(id_str) }, { STR(id_str) },

1
wpa_supplicant/config_file.c
View file

@ -775,6 +775,7 @@ static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid)
#endif /* IEEE8021X_EAPOL */ #endif /* IEEE8021X_EAPOL */
INT(mode); INT(mode);
INT(no_auto_peer); INT(no_auto_peer);
INT(noscan);
INT(mesh_fwding); INT(mesh_fwding);
INT(frequency); INT(frequency);
INT(enable_edmg); INT(enable_edmg);

2
wpa_supplicant/config_ssid.h
View file

@ -1035,6 +1035,8 @@ struct wpa_ssid {
*/ */
int no_auto_peer; int no_auto_peer;
int noscan;
/** /**
* mesh_rssi_threshold - Set mesh parameter mesh_rssi_threshold (dBm) * mesh_rssi_threshold - Set mesh parameter mesh_rssi_threshold (dBm)
* *

2
wpa_supplicant/mesh.c
View file

@ -506,6 +506,8 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s,
frequency); frequency);
goto out_free; goto out_free;
} }
if (conf->noscan)
ssid->noscan = 1;
if (ssid->mesh_basic_rates == NULL) { if (ssid->mesh_basic_rates == NULL) {
/* /*

8
wpa_supplicant/wpa_supplicant.c
View file

@ -2903,7 +2903,7 @@ static bool ibss_mesh_can_use_vht(struct wpa_supplicant *wpa_s,
const struct wpa_ssid *ssid, const struct wpa_ssid *ssid,
struct hostapd_hw_modes *mode) struct hostapd_hw_modes *mode)
{ {
if (mode->mode != HOSTAPD_MODE_IEEE80211A) if (mode->mode != HOSTAPD_MODE_IEEE80211A && !(ssid->noscan))
return false; return false;
if (!drv_supports_vht(wpa_s, ssid)) if (!drv_supports_vht(wpa_s, ssid))
@ -2976,7 +2976,7 @@ static void ibss_mesh_select_40mhz(struct wpa_supplicant *wpa_s,
int i, res; int i, res;
unsigned int j; unsigned int j;
static const int ht40plus[] = { static const int ht40plus[] = {
36, 44, 52, 60, 100, 108, 116, 124, 132, 140, 1, 2, 3, 4, 5, 6, 7, 36, 44, 52, 60, 100, 108, 116, 124, 132, 140,
149, 157, 165, 173, 184, 192 149, 157, 165, 173, 184, 192
}; };
int ht40 = -1; int ht40 = -1;
@ -3227,7 +3227,7 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
int ieee80211_mode = wpas_mode_to_ieee80211_mode(ssid->mode); int ieee80211_mode = wpas_mode_to_ieee80211_mode(ssid->mode);
enum hostapd_hw_mode hw_mode; enum hostapd_hw_mode hw_mode;
struct hostapd_hw_modes *mode = NULL; struct hostapd_hw_modes *mode = NULL;
int obss_scan = 1; int obss_scan = !(ssid->noscan);
u8 channel; u8 channel;
bool is_6ghz, is_24ghz; bool is_6ghz, is_24ghz;
bool dfs_enabled = wpa_s->conf->country[0] && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR); bool dfs_enabled = wpa_s->conf->country[0] && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR);
@ -3271,6 +3271,8 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
freq->he_enabled = ibss_mesh_can_use_he(wpa_s, ssid, mode, freq->he_enabled = ibss_mesh_can_use_he(wpa_s, ssid, mode,
ieee80211_mode); ieee80211_mode);
freq->channel = channel; freq->channel = channel;
if (mode->mode == HOSTAPD_MODE_IEEE80211G && ssid->noscan)
ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan, dfs_enabled);
/* Setup higher BW only for 5 GHz */ /* Setup higher BW only for 5 GHz */
if (mode->mode == HOSTAPD_MODE_IEEE80211A) { if (mode->mode == HOSTAPD_MODE_IEEE80211A) {
ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan, dfs_enabled); ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan, dfs_enabled);