merge in klp-release (no-op)
Fix ENABLE_NETWORK not to reconnect in disconnected state (DO NOT MERGE)

DISCONNECT followed by ENABLE_NETWORK ended up starting a scan for a new
connection due to wpa_supplicant_enable_one_network() setting
wpa_s->reassociate = 1. This was done regardless of wpa_s->disconnected
being 1 which should imply that wpa_supplicant should not try to connect
before asked explicitly with REASSOCIATE or RECONNECT.

Fix this by making ENABLE_NETWORK setting of reassociate = 1 and
starting of scans for connection conditional on wpa_s->disconnected ==
0. This will make ENABLE_NETWORK trigger a connection only if
wpa_supplicant is already in a state where it would try to connect if
there are any enabled networks.

Bug: 10483405

Change-Id: Iae606745270f6f3185d5705947f8ccd46bc3a904
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Prohibit pno start during assoc process and in connect state

Change-Id: I58bc138d5b74b1b62f7a9612c12399083aef1374
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
TDLS: Provide external control to specify the peers for setup (DO NOT MERGE)

Bug: 11631777

Change-Id: I3fbcf3cef4a6a4d894f78dd3dbe4757831e4fc56
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1
Merge branch 'android-4.4' of https://github.com/omnirom/android_external_wpa_supplicant_8 into android-4.4