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>
wpa_supplicant_8: Remove android specific handling for assoc reject events

Android specific changes was disabling the network on certain Assoc reject
event from the driver, which disables the network permanently until user
reinvokes the network. Removing this change specific to android.
(Propagation - Modified the summary, 2 more files changed)

Change-Id: I7064515b6592d60ac9215ab32f01c22ae3dfd514
CRs-fixed: 424592
(cherry picked from commit b7281ac592718302065b131eebffd84fdae53ad3)
(cherry picked from commit e8e31c42c5f211b228adf0a4efd58a2c4bc3869d)
Android: Enable WNM in the build

Git-commit: 095da179de2f5583e29a081b176901edcd602df7
Git-repo : git://w1.fi/srv/git/hostap.git
Signed-hostap: Jouni Malinen <j@w1.fi>
CRs-fixed: 471989

Change-Id: I384dbc784bbf0872056ee06305948d51392f78a4

Conflicts:

	wpa_supplicant/android.config
(cherry picked from commit f7e7e2beef2dca25e04b526ac589b5729c17ff1a)
(cherry picked from commit f9cb71b046c880b7811e39d2688fc35482655104)
Android: Enable IEEE 802.11w support in the build

Git-commit: 9210bea172b4c92680de070d329b76bdc17332b7
Git-repo : git://w1.fi/srv/git/hostap.git
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

Change-Id: Ib2d6a3c71a8fa9624a56180df6359cf6bdd9a032
(cherry picked from commit 1a4419c804e80f76398e98352d930fb3bfb35d21)
(cherry picked from commit a85bbe15ac1e14c7f9af78ec9217663b8fd765a7)
Android: Enable IEEE 802.11r in wpa_supplicant builds

This change is to enable the 802.11r feature in
android supplicant builds
CRs-fixed: 434525
Git-commit: ee9a95c34e90a5f5f8577a793e926cab949c74c2
Git-repo: git://w1.fi/srv/git/hostap.git

Change-Id: I58f9257b0a2dbe54d9d7d57c06217f3724425a49
(cherry picked from commit f5b2207eedd96f1afbed0d6b0ab3e6fb896f509b)
(cherry picked from commit e813b2c0d83a1027729acb16a19c920a6f410c99)
Enabling the HS2.0 functionality in the default config file

Enabling HotSpot 2.0 and Internetworking(802.11u).
CRs-Fixed: 443900, 443911
Change-Id: I2c1c7c25a526a05f3e9f6da10f8054e7e2cc5916
(cherry picked from commit 6bc92726370167e94bf0afb9ec1748e700169d8f)
(cherry picked from commit 082b9328db5031e8abfe47edffc99944d6d9bcc3)
Android: Add PMF support to hostapd build

Git-commit: 962b8b36e67d8cfe20528d37e4bb2b366aaf24f0
Git-repo : git://w1.fi/srv/git/hostap.git
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

Change-Id: I017378cfec3c4c3a53a0196458bfa49ae68d3b2f
(cherry picked from commit 444392852af5d347cbb546d8e6e96b0ef34a6741)
(cherry picked from commit d444a58cae23dfaeb7194077c73158c073f16b36)
WPS: Ignore PBC-to-PIN change from M1 to M2 as a workaround

Some APs may incorrectly change Device Password ID from PBC in M1 to
Default PIN in M2 even when they are ready to continue with PBC. This
behavior used to work with earlier implementation in wpa_supplicant, but
commit b4a17a6ea74b2ffba082e05c84730e979513042c started validating this
as part of a change that is needed to support NFC configuration method.

While this kind of AP behavior is against the WSC specification and
there could be potential use cases for moving from PBC to PIN, e.g., in
case of PBC session overlap, it is justifiable to work around this issue
to avoid interoperability issues with deployed APs. There are no known
implementations of PBC-to-PIN change from M1 to M2, so this should not
reduce available functionality in practice.

CRs-Fixed: 543656
Git-commit: d047ae6278324fdb73c7b8bff22eda71697d7a93
Git-repo: git://w1.fi/srv/git/hostap.git
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

Change-Id: I8c2ba2184f9f6f658ccd45e6974028540cd973de
(cherry picked from commit 5d2c05b9160843d8282c4aafd6ed962be3cd1f79)
(cherry picked from commit dfdf7b574d3def56ba24836083903d37f270fba9)
Use configured sched_scan interval for the PNO scan

The interval for the PNO scan did not use the configured sched_scan
interval. This commit addresses the same by using the configured value
or the default of 10 seconds if configuration parameter is not used.

Change-Id: Id6e43bc88e6dc19e7f0424424433a5863c4d39c6
CRs-fixed: 546777
Git-commit: 3cc247a78fc86043a68d5c1b916c8d1873c60157
Git-repo: git://w1.fi/srv/git/hostap.git
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
(cherry picked from commit 5379feacfebe3b07b228940210683bfcc3ec3225)
(cherry picked from commit c3fc978182b5837f52761406bde8c11049e6464c)
p2p: Add p2p_no_group_iface flag to p2p conf file

Avoid to create new interface for p2p connection, As an extra
new interface will consume one HW index

Change-Id: Id0fac3d30dc33797c93a72466ef3a839254b1117
CRs-fixed: 520439
(cherry picked from commit 3606092fe3c13f7488518607a6fa0bfcd44df272)
(cherry picked from commit 17715e91c27e410489f7355034475812d700939c)
P2P: Show P2P flag in BSS entries also based on Beacon frames

It is possible that a P2P GO has been discovered through a non-P2P scan
that did not return P2P IE in Probe Response frames. To cover those
cases, check also Beacon frame (if received) for P2P IE.

Change-Id: If1d855022785f5d801e2d91c1d2fcac35760f717
CRs-Fixed: 535523
Git-commit: bb50ae439686fb69f52288a618e6d176462ab726
Git-repo: git://w1.fi/srv/git/hostap.git
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
(cherry picked from commit 17b6b631b5e31195e260edd9728eb97baeccabd2)
(cherry picked from commit f8329341d7b83e9577463f49cfc2919086d3099e)
P2P: Show p2p flag in debug info for scan results

This makes it easier to confirm that P2P capabilities for a GO has been
discovered properly.

Change-Id: If214f9c8ea492fb2f13a0dbb98fd964f7d118531
CRs-Fixed: 535523
Git-commit: b16696ff72969329c9e4507f9bbcaf5882b492f7
Git-repo: git://w1.fi/srv/git/hostap.git
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
(cherry picked from commit 20bf214722fcc1cab6a6395a9e5e65c8fa35425b)
(cherry picked from commit 7b0846694029a7f1d090fc5e6a76711588ca5d38)
P2P: Allow GO to be discovered based on Beacon frame

This fixes some P2P-join-a-group cases where GO may have been discovered
based on passive scan or non-P2P scan. P2P IEs may have been received
from a Beacon frame in such a case and that information can be used to
create a P2P peer entry, e.g., to allow provision discovery exchange to
be completed.

Change-Id: I8502c61fa0f149f7636708458f5e51ca627ac6b7
CRs-Fixed: 535523
Git-commit: aaeb9c98e6aad64bbf92c7cb6ef4531c039b8a1d
Git-repo: git://w1.fi/srv/git/hostap.git
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
(cherry picked from commit 45ab8e8fff56baa890f5365902eb0c15ca043fa7)
(cherry picked from commit b8e3662345dd5f47f1f96c391f8a765d27dc54a5)
P2P: Do not drop P2P IEs from BSS table on non-P2P scans

This could happen when non-P2P station interface runs a scan without P2P
IE in the Probe Request frame. P2P GO would reply to that with a Probe
Response that does not include P2P IE. Do not update the IEs in this BSS
entry to avoid such loss of information that may be needed for P2P
operations to determine group information.

Change-Id: I2af1f4487a358da57b885ff63e879aaea4fd2508
CRs-Fixed: 535523
Git-commit: ff57398fcab817374dac975aaab3eef5bf64f381
Git-repo: git://w1.fi/srv/git/hostap.git
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
(cherry picked from commit 303229f20f6a07b001b3924d3804cb357a63c803)
(cherry picked from commit 8ca35e8b0cf4f316588cd0de3d74698d4f395717)
P2P: Do not allow P2P client connection without P2P IE from GO

P2P-GROUP-STARTED event depends on having enough information about the
group available. To avoid incomplete information from being delivered to
upper layers, do not accept scan results without P2P IE (e.g., from a
non-P2P scan) for P2P client association process. This can be of use for
some join-a-group cases where non-P2P scans have generated the BSS entry
for the GO.

Change-Id: I42bc5c5cc17d7786eaf4018c2774bb13bb6e4be2
CRs-Fixed: 535523
Git-commit: b72e14e599785e377881a2a8cd26b42f90bdc5f6
Git-repo: git://w1.fi/srv/git/hostap.git
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
(cherry picked from commit 855bc69863724ec6ecab75a38fd9d3e0d12dd2af)
(cherry picked from commit 54fd6b4cda640a47275f2149ab92b5bd48f42923)
P2P: Allow persistent group determination based on Beacon frame

P2P IE may be available from a Beacon frame from a GO even if we have
not yet received a Probe Response frame with P2P IE from that GO. Since
all the needed information for determining the GO's P2P Device Address
and group capabilities are available, use that information instead of
displaying incomplete group information.

Change-Id: I4eb179351b1d104d2ca31023c3405aaa570d21fc
CRs-Fixed: 535523
Git-commit: 5df7414b04fc0bfa0abea1a2662746d348104972
Git-repo: git://w1.fi/srv/git/hostap.git
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
(cherry picked from commit f44b2d17a12714e8f4c012e65e6dedea2d5d2f2c)
(cherry picked from commit 14a46007d37e538605064c83710ee03e13b33e92)
Fix ENABLE_NETWORK not to reconnect in disconnected state

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.

Change-Id: I3f15688d7016551219182e6f8e751941b6340aa6
CRs-Fixed: 564226
Git-commit:d2592497624d7dff53e71cc01fc2d5db1e59733e
Git-repo: git://w1.fi/srv/git/hostap.git
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
P2P: Increase Invitation Request timeouts

In noisy environment peer may take more time to send Invitation
Response so increase Invitation Response timeout to 500 ms in success
case and also increase Invitation Request action wait time to 500 ms.
This makes the Invitation Request case use the same timeout with GO
Negotiation.

CRs-Fixed: 538699
Git-commit: 63ce59dea8c6b458d9a0c24e91f971f461f17b79
Git-repo: git://w1.fi/srv/git/hostap.git
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Change-Id: Idd3dea0e7ed16cd7564b34dfe279a49f16f021d4
P2P: Cancel group formation timeout on client connection

It was possiblle for the group formation timeout to be left running even
after the P2P Client connected to the group if the WPS provisioning step
was not completed cleanly (e.g., due to WSC_Done not getting received
from the client). There is no need to remove the group in such case due
to the initial group formation timeout, so work around this by removing
that timeout on data connection.

CRs-Fixed: 538026
Git-commit: eab2b50dc83e1d14dcb573dfc9b10fc6a9cb1cdd
Git-repo: git://w1.fi/srv/git/hostap.git
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Change-Id: I15e65a8e2436db5c408d5960bff6ba7af16f62c1