diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2012-02-09 12:46:44 +0200 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2012-02-09 12:46:44 +0200 |
| commit | 165ec7305392b69d4cc8d57af126159a35b2aa1b (patch) | |
| tree | 9e8d8a880a4ca605286c3cdeb460cf453207004f /src | |
| parent | 84751b98c151f70c322b6b7f70d967400e147852 (diff) | |
| download | external_wpa_supplicant_8_ti-165ec7305392b69d4cc8d57af126159a35b2aa1b.zip external_wpa_supplicant_8_ti-165ec7305392b69d4cc8d57af126159a35b2aa1b.tar.gz external_wpa_supplicant_8_ti-165ec7305392b69d4cc8d57af126159a35b2aa1b.tar.bz2 | |
P2P: Fix p2p_scan() error processing in p2p_search()
Commit 39185dfa549f076a6be114e0149a3649d302f477 changed the p2p_scan()
callback to return 1 in some cases, but forgot to change this p2p_scan()
call to handle that properly. Fix this by processing any non-zero value
as an error. This regression could leave the P2P module in state where
it believed a P2P scan was still running and refused to start some
operations until that scan gets completed (which would never happen
since it was not really started).
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/p2p/p2p.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index e7ce230..82932aa 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -824,7 +824,7 @@ static void p2p_search(struct p2p_data *p2p) if (p2p->cfg->p2p_scan(p2p->cfg->cb_ctx, type, freq, p2p->num_req_dev_types, p2p->req_dev_types, - p2p->find_dev_id) < 0) { + p2p->find_dev_id)) { wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Scan request failed"); p2p_continue_find(p2p); |