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 /src/p2p/p2p_go_neg.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 'src/p2p/p2p_go_neg.c')
| -rw-r--r-- | src/p2p/p2p_go_neg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/p2p/p2p_go_neg.c b/src/p2p/p2p_go_neg.c index 8c2ad3a..2d31f4b 100644 --- a/src/p2p/p2p_go_neg.c +++ b/src/p2p/p2p_go_neg.c @@ -1043,7 +1043,8 @@ void p2p_process_go_neg_resp(struct p2p_data *p2p, const u8 *sa, wpa_hexdump(MSG_DEBUG, "P2P: channels", c->channel, c->channels); } - if (!p2p_channels_includes(&intersection, p2p->op_reg_class, + if (!p2p->cfg->cfg_op_channel || + !p2p_channels_includes(&intersection, p2p->op_reg_class, p2p->op_channel)) p2p_reselect_channel(p2p, &intersection); |