diff options
| author | Vishal Mahaveer <vishalm@ti.com> | 2012-10-16 13:51:37 -0500 |
|---|---|---|
| committer | Vishal Mahaveer <vishalm@ti.com> | 2012-10-16 13:51:37 -0500 |
| commit | abcd165be8b5310d5446d9f18ae874d601f5bad1 (patch) | |
| tree | efbf9ef81f6c7a52883790ebd40e3216a19aad6f /wpa_supplicant/ctrl_iface.c | |
| parent | 761368a07b3754dced0e351cac57c4c95730d5d3 (diff) | |
| parent | ba611a1c583af871c72ad50ec0bace0ce03689d2 (diff) | |
| download | external_wpa_supplicant_8_ti-abcd165be8b5310d5446d9f18ae874d601f5bad1.zip external_wpa_supplicant_8_ti-abcd165be8b5310d5446d9f18ae874d601f5bad1.tar.gz external_wpa_supplicant_8_ti-abcd165be8b5310d5446d9f18ae874d601f5bad1.tar.bz2 | |
Merge commit 'ol_r8.a4.04' into d-jb-release
Diffstat (limited to 'wpa_supplicant/ctrl_iface.c')
| -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 */ |