From 82cd40e7b712dd9886ebb61e4ca468458d58849c Mon Sep 17 00:00:00 2001 From: Arik Nemtsov Date: Mon, 24 Sep 2012 12:51:20 +0200 Subject: P2P: don't handle concurrency conflicts in multi-chan mode (ANDROID) When the multi-channel flag is on, don't try to force specific p2p connection modes or change go_intent. Signed-off-by: Arik Nemtsov --- wpa_supplicant/ctrl_iface.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 2fdd535..8aad951 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -2974,6 +2974,9 @@ int p2p_handle_concurrency_conflicts(struct wpa_supplicant *wpa_s, int *go_inten struct wpa_supplicant *iface = NULL; struct p2p_data *p2p = wpa_s->global->p2p; + if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_MULTI_CHANNEL_CONCURRENT) + return 0; + wpa_printf(MSG_INFO, "p2p: handling concurrency conflicts"); /* we only fear frequency conflicts */ -- cgit v1.1