P2P: Check if the pref_freq reported by the driver supports P2P

Filter out get_pref_freq_list() (i.e.,
QCA_NL80211_VENDOR_SUBCMD_GET_PREFERRED_FREQ_LIST) output in case of
channel negotiation by removing channels that do not allow P2P operation
at all. Previously, only the explicitly disallowed channels were removed
and that could have resulted in selecting an operating channel that is
not allowed for P2P and failing to complete the operation to start the
group.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index b1fdc2837ff06779db8556ae7fd7907de0c6e2ae..648c840d80915aea243dc1f6673937dc1a66bd19 100644 (file)
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -5236,8 +5236,10 @@ static int wpas_p2p_setup_freqs(struct wpa_supplicant *wpa_s, int freq,
                if (!res && max_pref_freq > 0) {
                        *num_pref_freq = max_pref_freq;
                        i = 0;
-                       while (wpas_p2p_disallowed_freq(wpa_s->global,
-                                                       pref_freq_list[i]) &&
+                       while ((!p2p_supported_freq(wpa_s->global->p2p,
+                                                   pref_freq_list[i]) ||
+                               wpas_p2p_disallowed_freq(wpa_s->global,
+                                                       pref_freq_list[i])) &&
                               i < *num_pref_freq) {
                                wpa_printf(MSG_DEBUG,
                                           "P2P: preferred_freq_list[%d]=%d is disallowed",