aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/mesh.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2015-01-10 11:03:45 (GMT)
committerJouni Malinen <j@w1.fi>2015-01-10 15:35:53 (GMT)
commit54fe48b9dc1411da63a30f0c3ad073d8da9e41ac (patch)
tree341f3cdf1daf2bf168370f7a6aa6768909e8f447 /wpa_supplicant/mesh.c
parentf7e889fa2df488953156e03c92ffc6b1ad964271 (diff)
downloadhostap-54fe48b9dc1411da63a30f0c3ad073d8da9e41ac.zip
hostap-54fe48b9dc1411da63a30f0c3ad073d8da9e41ac.tar.gz
hostap-54fe48b9dc1411da63a30f0c3ad073d8da9e41ac.tar.bz2
mesh: Use the shared function with IBSS to determine channel parameters
Automatically enable HT20, HT40+, HT40-, or VHT, based on driver capabilities. This obsoletes the mesh_ht_mode network block parameter that was previously used to configure HT parameters. Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant/mesh.c')
-rw-r--r--wpa_supplicant/mesh.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c
index 6d3c19a..5fdf4e0 100644
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
@@ -318,23 +318,8 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s,
os_memset(&params, 0, sizeof(params));
params.meshid = ssid->ssid;
params.meshid_len = ssid->ssid_len;
- params.freq = ssid->frequency;
- wpa_s->mesh_ht_enabled = ssid->mesh_ht_mode > CHAN_NO_HT;
- switch (ssid->mesh_ht_mode) {
- case CHAN_HT20:
- params.freq.ht_enabled = 1;
- break;
- case CHAN_HT40PLUS:
- params.freq.ht_enabled = 1;
- params.freq.sec_channel_offset = 1;
- break;
- case CHAN_HT40MINUS:
- params.freq.ht_enabled = 1;
- params.freq.sec_channel_offset = -1;
- break;
- default:
- break;
- }
+ ibss_mesh_setup_freq(wpa_s, ssid, &params.freq);
+ wpa_s->mesh_ht_enabled = !!params.freq.ht_enabled;
if (ssid->beacon_int > 0)
params.beacon_int = ssid->beacon_int;
else if (wpa_s->conf->beacon_int > 0)