diff options
| author | Arik Nemtsov <arik@wizery.com> | 2012-09-24 12:51:20 +0200 |
|---|---|---|
| committer | Arik Nemtsov <arik@wizery.com> | 2012-09-24 21:14:06 +0200 |
| commit | 82cd40e7b712dd9886ebb61e4ca468458d58849c (patch) | |
| tree | 06216998d8838ad3f3c20584f4d426afa718a010 /wpa_supplicant | |
| parent | 9c03c3c348b3660a820d7dfd4fb762d5eb9fca4c (diff) | |
| download | external_wpa_supplicant_8_ti-82cd40e7b712dd9886ebb61e4ca468458d58849c.zip external_wpa_supplicant_8_ti-82cd40e7b712dd9886ebb61e4ca468458d58849c.tar.gz external_wpa_supplicant_8_ti-82cd40e7b712dd9886ebb61e4ca468458d58849c.tar.bz2 | |
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 <arik@wizery.com>
Diffstat (limited to 'wpa_supplicant')
| -rw-r--r-- | wpa_supplicant/ctrl_iface.c | 3 |
1 files changed, 3 insertions, 0 deletions
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 */ |