aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/ap.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2015-06-28 15:14:58 (GMT)
committerJouni Malinen <j@w1.fi>2015-06-28 15:14:58 (GMT)
commit55413ce072aaf52d583e36e5401a51857cb9ab1f (patch)
tree561853d119c1fdd2105fec9149f54bc45710aa94 /wpa_supplicant/ap.c
parent8c43ef8449bd4d2d0983db394770bd73f572b12d (diff)
downloadhostap-55413ce072aaf52d583e36e5401a51857cb9ab1f.zip
hostap-55413ce072aaf52d583e36e5401a51857cb9ab1f.tar.gz
hostap-55413ce072aaf52d583e36e5401a51857cb9ab1f.tar.bz2
P2P: Do not allow 40 MHz co-ex PRI/SEC switch to force MCC
Do not allow 40 MHz co-ex PRI/SEC switch to force us to change our PRI channel if we have an existing connection on the selected PRI channel since doing multi-channel concurrency is likely to cause more harm than using different PRI/SEC selection in environment with multiple BSSes on these two channels with mixed 20 MHz or PRI channel selection. Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant/ap.c')
-rw-r--r--wpa_supplicant/ap.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index f3960c5..aaea524 100644
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -142,6 +142,29 @@ void wpa_supplicant_conf_ap_ht(struct wpa_supplicant *wpa_s,
}
}
}
+
+ if (conf->secondary_channel) {
+ struct wpa_supplicant *iface;
+
+ for (iface = wpa_s->global->ifaces; iface; iface = iface->next)
+ {
+ if (iface == wpa_s ||
+ iface->wpa_state < WPA_AUTHENTICATING ||
+ (int) iface->assoc_freq != ssid->frequency)
+ continue;
+
+ /*
+ * Do not allow 40 MHz co-ex PRI/SEC switch to force us
+ * to change our PRI channel since we have an existing,
+ * concurrent connection on that channel and doing
+ * multi-channel concurrency is likely to cause more
+ * harm than using different PRI/SEC selection in
+ * environment with multiple BSSes on these two channels
+ * with mixed 20 MHz or PRI channel selection.
+ */
+ conf->no_pri_sec_switch = 1;
+ }
+ }
#endif /* CONFIG_IEEE80211N */
}