]> git.ipfire.org Git - thirdparty/hostap.git/commit
P2P: Clear p2p_in_invitation on cancel
authorJouni Malinen <jouni@qca.qualcomm.com>
Mon, 7 Apr 2014 09:26:04 +0000 (12:26 +0300)
committerJouni Malinen <j@w1.fi>
Mon, 7 Apr 2014 10:40:58 +0000 (13:40 +0300)
commitf05cee9714ae87d315d893699a536b60a5aa73a9
tree7a2fa0c8a9942a5225c0d7ff9c49be0738d579e1
parent2de01c9d821f4deba0bffbf9f7573faeae44f45f
P2P: Clear p2p_in_invitation on cancel

Commit 41d5ce9e0b7b37dd84fbf3c1aa5ed571c32321d4 added scan optimizations
for P2P invitation cases. However, it left a path where the invitation
state was not cleared and as such, introduced potential issues for
following scans that ended up getting incorrectly optimized for a single
channel regardless of parameters. Fix this by clearing p2p_in_invitation
more carefully, especially on p2p_cancel command.

p2p_cancel is now also run from the FLUSH command to avoid issues with
hwsim test cases (e.g., persistent_group_per_sta_psk followed by
ap_open_tdls resulted in an error due to p2p_in_invitation remaining set
after FLUSH).

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
wpa_supplicant/ctrl_iface.c
wpa_supplicant/p2p_supplicant.c