Revert "[wpa_supplicant] Cumulative patch from c4e90da6d"
This reverts commit 39bc25d3a79c1375de430a7918d949c1a86f70c6.
Test: Compilation
Change-Id: Iae7670429466958911b5296cb1359bceecc0b03e
Exempt-From-Owner-Approval: Revert since it's breaking the build
diff --git a/src/p2p/p2p_utils.c b/src/p2p/p2p_utils.c
index 1a62a44..2e2aa8a 100644
--- a/src/p2p/p2p_utils.c
+++ b/src/p2p/p2p_utils.c
@@ -413,30 +413,17 @@
int p2p_channel_random_social(struct p2p_channels *chans, u8 *op_class,
- u8 *op_channel,
- struct wpa_freq_range_list *avoid_list,
- struct wpa_freq_range_list *disallow_list)
+ u8 *op_channel)
{
u8 chan[4];
unsigned int num_channels = 0;
- /* Try to find available social channels from 2.4 GHz.
- * If the avoid_list includes any of the 2.4 GHz social channels, that
- * channel is not allowed by p2p_channels_includes() rules. However, it
- * is assumed to allow minimal traffic for P2P negotiation, so allow it
- * here for social channel selection unless explicitly disallowed in the
- * disallow_list. */
- if (p2p_channels_includes(chans, 81, 1) ||
- (freq_range_list_includes(avoid_list, 2412) &&
- !freq_range_list_includes(disallow_list, 2412)))
+ /* Try to find available social channels from 2.4 GHz */
+ if (p2p_channels_includes(chans, 81, 1))
chan[num_channels++] = 1;
- if (p2p_channels_includes(chans, 81, 6) ||
- (freq_range_list_includes(avoid_list, 2437) &&
- !freq_range_list_includes(disallow_list, 2437)))
+ if (p2p_channels_includes(chans, 81, 6))
chan[num_channels++] = 6;
- if (p2p_channels_includes(chans, 81, 11) ||
- (freq_range_list_includes(avoid_list, 2462) &&
- !freq_range_list_includes(disallow_list, 2462)))
+ if (p2p_channels_includes(chans, 81, 11))
chan[num_channels++] = 11;
/* Try to find available social channels from 60 GHz */