From: Ilan Peer <ilan.peer@intel.com>
Date: Tue, 8 Sep 2015 09:46:09 +0000 (+0300)
Subject: P2P: Fix the calculation of group common freqs
X-Git-Tag: hostap_2_5~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6d7965d2527a48858d41648c8a9b9acee01e41c;p=thirdparty%2Fhostap.git

P2P: Fix the calculation of group common freqs

Previously, the calculation allowed for the same frequency to appear
several times in the result.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
---

diff --git a/src/p2p/p2p_utils.c b/src/p2p/p2p_utils.c
index e139d03ea..2e2aa8ad0 100644
--- a/src/p2p/p2p_utils.c
+++ b/src/p2p/p2p_utils.c
@@ -459,12 +459,22 @@ int p2p_channels_to_freqs(const struct p2p_channels *channels, int *freq_list,
 			break;
 		for (j = 0; j < c->channels; j++) {
 			int freq;
+			unsigned int k;
+
 			if (idx + 1 == max_len)
 				break;
 			freq = p2p_channel_to_freq(c->reg_class,
 						   c->channel[j]);
 			if (freq < 0)
 				continue;
+
+			for (k = 0; k < idx; k++) {
+				if (freq_list[k] == freq)
+					break;
+			}
+
+			if (k < idx)
+				continue;
 			freq_list[idx++] = freq;
 		}
 	}