diff options
| author | Hai Shalom <haishalom@google.com> | 2019-02-11 12:01:50 -0800 |
|---|---|---|
| committer | Peiyong Lin <lpy@google.com> | 2019-02-11 22:30:04 +0000 |
| commit | bf6e0baa89b80019dee7ebfbee1fc34581255a19 (patch) | |
| tree | fcd62236b41c2ce5b04923ba7a5a0213c8397ead /src/p2p/p2p.c | |
| parent | 39bc25d3a79c1375de430a7918d949c1a86f70c6 (diff) | |
| download | wpa_supplicant_8-bf6e0baa89b80019dee7ebfbee1fc34581255a19.tar.gz | |
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
Diffstat (limited to 'src/p2p/p2p.c')
| -rw-r--r-- | src/p2p/p2p.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index 47d95aef..585b4a04 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -1470,8 +1470,7 @@ static void p2p_prepare_channel_best(struct p2p_data *p2p) p2p->op_channel = p2p->cfg->op_channel; } else if (p2p_channel_random_social(&p2p->cfg->channels, &p2p->op_reg_class, - &p2p->op_channel, - NULL, NULL) == 0) { + &p2p->op_channel) == 0) { p2p_dbg(p2p, "Select random available social channel (op_class %u channel %u) as operating channel preference", p2p->op_reg_class, p2p->op_channel); } else { @@ -4770,12 +4769,9 @@ void p2p_set_managed_oper(struct p2p_data *p2p, int enabled) int p2p_config_get_random_social(struct p2p_config *p2p, u8 *op_class, - u8 *op_channel, - struct wpa_freq_range_list *avoid_list, - struct wpa_freq_range_list *disallow_list) + u8 *op_channel) { - return p2p_channel_random_social(&p2p->channels, op_class, op_channel, - avoid_list, disallow_list); + return p2p_channel_random_social(&p2p->channels, op_class, op_channel); } |