diff options
author | Arik Nemtsov <arik@wizery.com> | 2012-09-24 16:13:33 +0200 |
---|---|---|
committer | Arik Nemtsov <arik@wizery.com> | 2012-09-24 21:14:06 +0200 |
commit | 6fdeed26208ecd0b2ec210a650df0b7c0ecfc2fe (patch) | |
tree | d93e752df40d0e3955a554e90f37574d5b2de81e | |
parent | 82cd40e7b712dd9886ebb61e4ca468458d58849c (diff) | |
download | external_wpa_supplicant_8_ti-6fdeed26208ecd0b2ec210a650df0b7c0ecfc2fe.zip external_wpa_supplicant_8_ti-6fdeed26208ecd0b2ec210a650df0b7c0ecfc2fe.tar.gz external_wpa_supplicant_8_ti-6fdeed26208ecd0b2ec210a650df0b7c0ecfc2fe.tar.bz2 |
P2P: fix oper channel selection (SQUASH)
Handles the forgotten p2p_process_go_neg_resp() case of patch:
commit 66b8140a08b9f6297cd49a3428ada713bf668300
Author: Arik Nemtsov <arik@wizery.com>
Date: Thu Aug 30 21:06:45 2012 +0300
P2P: always re-select oper channel if not hard coded
Signed-off-by: Arik Nemtsov <arik@wizery.com>
-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); |