Cumulative patch from commit 3e949655c

Bug: 122900873
Test: Device boots up and connects to wifi networks.
Test: Able to turn on/off softap.
Test: Regression test passed (Bug: 122910510)

3e949655c Revert "mesh: Apply channel attributes before setup interface"
9758b08bc hostapd: Add support for setting pbss option from config file
cc0f24196 D-Bus: Fix P2P Flush method to clear pending Action frames
fff8da8ac Add a vendor attribution to transfer EVM information
a95906f93 P2P: support random interface address
9359cc848 P2P: Support random device address
67d35396c Fix build with LibreSSL
5a3319ab1 P2P: Add 802.11ax support for P2P GO
9da1641a4 Clarify documentation of avoid channels expectations
8c70c3047 HS 2.0 server: Log new username in eventlog for cert reenroll
11ce7a1bc HE: Add MU EDCA Parameter Set element (AP)
cfb01f58a eapol_test: Start the identifier at an initial random value
6bcbda408 drivers: Set CONFIG_LIBNL32=y automatically based on pkg-config
41b747522 drivers: Move libnl related build flags to separate ifdef block
a07b8a70b mka: New MI should only be generated when peer's key is invalid
d896874f8 nl80211: Indicate 802.1X 4-way handshake offload in connect
436ee2fd9 drivers: Add separate driver flags for 802.1X and PSK 4-way HS offloads
10de40c0c DFS: Restart pending CAC on interface enable
b06d60a90 Use freq_list to constrain supported operating class information
cb828507f Use disable_ht/vht to constrain supported operating class information
27ebadccf RADIUS client: Cease endless retry for message for multiple servers
166ab0b78 QCA vendor commands to configure HE +HTC capability and OM control Tx
89d79150a Avoid forward references to enum types in ieee802_11_common.h
e5a9b1e8a mesh: Implement use of VHT20 config in mesh mode
806db174f mesh: Add VHT_CHANWIDTH_USE_HT to max_oper_chwidth
bb35e2d21 hostapd: Work around an interop connection issue in FT-PSK + WPA-PSK
fd83a8081 wpa_supplicant: Allow disabling VHT SGI capability
02f52ab6f Use lchown() instead of chown() for self-created files
b686745c7 Android: Harden wpa_ctrl_open2() against potential race conditions
59bf0f971 DFS: Add supported channel bandwidth checking
75ce63e06 ACS: Add supported channel bandwidth checking
ce6d9ce15 hostapd: Add supported channel bandwidth checking infrastructure
4299ad826 nl80211: Add supported bandwidth parsing
22dcafc20 ACS: Add support for 160 MHz bandwidth
441ba1a3e dbus: Fix build without CONFIG_WNM=y
aae0eece5 EAP-TLS: Update Session-Id derivation with TLS v1.3
cc9c4fecc OpenSSL: Allow systemwide policies to be overridden
e3afbd796 OSEN: Disable TLS v1.3 by default
568e890e7 OpenSSL: Fix build with OpenSSL 1.0.2
4cf5efece FT: Allow STA entry to be removed/re-added with FT-over-the-DS
f808bd59e FT: Do not try to use FT-over-air if reassociation cannot be used
19c3a9a88 P2PS: Notify D-Bus about removal of a stale/empty persistent group
69dc9cabc P2PS: Notify D-Bus about removal of a stale persistent group
0332c27e3 mesh: Consider mesh interface on DFS event handler
fed51174d mesh: Reflect country setting to mesh configuration for DFS
256418444 mesh: Apply channel attributes before setup interface
3ba4a25e5 mesh: Set interface type to mesh before setting interface
c95619c21 mesh: Set mesh VHT center frequency
4b5453ced mesh: Relocate RSN initialization
0daa7b75f mesh: Factor out mesh join function
187784290 mesh: Factor out RSN initialization
b9eb717f8 wpa_cli: Add command for setting PSK_PASSPHRASE
38b405c8f dbus: Expose authentication status to D-Bus
80d06d0ca dbus: Export BSS Transition Management status
2bbad1c7c dbus: Export roam time, roam complete, and session length
ba4f3224a Allow remote RADIUS authentication with local VLAN management
ed87f6a80 Use a helper function for checking Extended Capabilities field
e6b0898da Add [FST] and [UTF-8] flags to BSS command output
1f2c42cc7 Show [UTF-8] flag if the SSID is reported as UTF-8
e5904cf46 crypto internal: Make MD4 PADDING array const
6ca4949ae RRM: Update own neighbor report on channel switch
0998d9bd4 RRM: Move neighbor report functions
dc6798238 hostapd: Fix a typo in function name
6ec02d77d crypto: Reduce the size of sha512_compress() stack frame
d6e7d4ded hostapd_cli: Add option to send beacon report request
ecef0687d RRM: Support for Last Beacon Report Indication subelement
3ec118780 RRM: Add support for beacon report fragmentation
46efa3dae dbus: Add vendor specific information element in peer properties
7814838f9 eloop: Fix kqueue event deletion filter
7153bd467 eloop: Fix fd_table allocation for epoll and kqueue
89a7cdd69 crypto: Add option to use getrandom()
2a5497969 wpa_ctrl: Make wpa_cli ping/pong work more reliably
658c39809 OpenSSL: Load chain certificates from client_cert file
fb60dbdce vlan: Use new bridge ioctl()
cc58a3573 Update copyright notices for the new year 2019
28ab9344b Use internal EAP server identity as dot1xAuthSessionUserName
a139ddb6c browser: Replace deprecated gtk_window_set_wmclass()
4b970ee57 HTTP (curl): Replace deprecated ASN1_STRING_data()
22d1b2ecd HTTP (curl): Fix build with newer OpenSSL versions
37f487bb4 HTTP (curl): Use DEFINE_STACK_OF() with newer OpenSSL versions
9805bb1bd HTTP (curl): Use SSL_get_SSL_CTX() helper
a89811382 HS 2.0: Fix EST compilation with OpenSSL 1.1.0 and newer
b2f1e5458 hostap: Silence compiler warnings about IFNAMSIZ buffers
2ea1fce3d OCE: RSSI-based rejection to consider Authentication frames (AP)
076f1ea1d OCE: Add RSSI based association rejection support (AP)
19677b77c OCE: Add RSSI based association rejection support (STA)
dc9b7d217 P2P: Set global->p2p_group_formation in wpas_p2p_join_start() for p2pdev
32bb47faa Update wpa_supplicant channel list on FLUSH
d8dda601f nl80211: Debug print channel list
fea49f8f9 nl82011: Make wiphy-specific country (alpha2) available in STATUS-DRIVER
02d53ac35 nl80211: Debug print details from the beacon hint events
dd5d325b0 hostapd: Add configuration option check_crl_strict
3518e3623 wpa_cli: Allow reconnect to global interface
52e78198b Add internal HMAC-SHA512 implementation to fix NEED_SHA512 builds
1b8ed2cac wpa_supplicant: Fix build with !CONFIG_AP and CONFIG_CTRL_IFACE_DBUS_NEW
a1417c7f9 mka: Log MI update failure in debug log
f9052d6ea nl80211: Note interface-removal-from-bridge errors in debug log
d01203caf hostapd: Add openssl_ecdh_curves configuration parameter
0521c6ebb OpenSSL: Add openssl_ecdh_curves parameter
b98933eaf HS 2.0: DHCP broadcast-to-unicast conversion before address learning
23693c9da mka: Make ICV Indicator dependant on ICV length
948ba8c29 mka: MIB information
8c652ecfb mka: Provide more status information over control interface
626bc1fac mka: Stop trying to generate and distribute new SAK when not key server
4060cb272 mka: Add more debug print details
27859f520 mka: Fix deleteSAs clearing of principal->new_key
4d91d4a7c mka: Derive MACsec cipher suite and MKA algorithm table index
594b7fbdd wpa_supplicant: Document nl80211 driver in the man page
a0bec739f mka: Clean up KaY log output
1cb508256 mka: Do not force entry into INIT state on CP state machine creation
785b219ab mka: Remove unused authorization data from CP
7251f0bad mka: Extend CAK/CKN-from-EAP-MSK API to pass in MSK length
871439b5d mka: Allow 256-bit CAK to be configured for PSK mode
7a2998488 mka: Allow CAK length 32 (256-bit) to be initialized
73111a63c mka: Determine KCK/ICK length from CAK length
b452a76e5 mka: ICV calculation using 256-bit ICK
7c3d1cc04 mka: Support 256-bit ICK derivation
175ebc1f7 mka: Support 256-bit KEK derivation
9b4a26669 mka: Support 256-bit CAK in SAK derivation
9dd701c12 mka: AES-CMAC-256 -based KDF
a8aeaf41d mka: Change MI if key invalid
c20cc5833 mka: Speed up processing of duplicated SCI
c1576d44a mka: Support for 256-bit SAK generation
c9c93e7a2 mka: Remember LowestPN for each key server
54c6a6995 mka: Check for errors on create Secure Channel
52171e18c mka: Fix a memory leak on error path
a6cd1be95 mka: Debug output cleanup/fix
e49b78c0d mka: Allow configuration of MACsec replay protection
e47c5227b wpa_debug: Support wpa_hexdump_ascii() outputting into syslog
302bbad5a mka: Do not update potential peer liveness timer
e4ae284bb mka: Consider missing MKPDU parameter sets a failure
db9ca18bb mka: Do not ignore MKPDU parameter set decoding failures
bab1d0d35 mka: Fix resource leak when detecting duplicated SCI
1cb0f63b0 mka: Fix READY to TRANSMIT logic in CP state machine
8ae29b4e9 mka: Fix READY to ABANDON logic in CP state machine
3dce43ba5 mka: Fix RECEIVING to TRANSMIT logic in CP state machine
06e06a8df mka: Fix RETIRE state deletion of SAs
2fc067568 mka: Fix lowest acceptable Packet Number (LPN) calculation and use
d9a0a7222 mka: Fix MKPDU SAK Use Body's Delay Protect bit setting
586454549 mka: Fix conf_offset value in MKPDU when in policy mode SHOULD_SECURE
b678ed1ef macsec: Make pre-shared CKN variable length
61127f162 MKA: Handle unaligned CKN length
f1ac2b8e6 MKA: Mark frame structs packed
91ad2f441 macsec_linux: Add driver status information
d0dde0808 driver: Fix a typo in a comment
93701b4af tests: Allow TX/RX data test to use different frame length
7c6acc757 macsec_linux: More detailed debug logs for driver interaction
5759bd36a WPS: Fix wps_validate_credential() argument type
e422a819d Check snprintf result to avoid compiler warnings
ee98dd631 Readme for DPP
c3f23ad6c dbus: Expose connected stations on D-Bus
f5f4c11aa dbus: Use dbus_bool_t, not int for boolean function arguments
cdeea70f5 wpa_supplicant: Allow overriding HT STBC capabilities
0fb292c08 Add SAE to GET_CAPABILITY key_mgmt
8ec7c99ee nl80211: Fetch supported AKM list from the driver
dbe7f6da7 Vendor command to query the supported AKMs from the driver
5bcddb930 DPP: Fix build with LibreSSL 2.8.3
837e36583 Fix build with LibreSSL
4d663233e hostapd: Support for overriding the bridge name per VLAN via vlan_file
d2b513811 DPP: Add self configuration command in hostapd_cli and wpa_cli
53d5de6f1 DPP: Accept DPP_CONFIGURATION_SIGN without double space before parameters
5b82cdbe8 nl80211: Add support for starting FTM responder
d2c4d1ee1 AP: Configure FTM responder parameters
4cb618cf2 driver: Add FTM responder configuration APIs
6a24adee9 Sync with mac80211-next.git include/uapi/linux/nl80211.h
2a93ecc8c Expose Multi-BSS STA capability through wpa_supplicant control interface
5abc7823b wpa_supplicant: Add Multi-AP backhaul STA support
9c06f0f6a hostapd: Add Multi-AP protocol support
fa9798126 OCV: Include and verify OCI in WNM-Sleep Exit frames
034388ac9 OCV: Include and verify OCI in the AMPE handshake
716ed96e8 OCV: Pass ocv parameter to mesh configuration
99621dc16 OCV: Include and verify OCI in the FILS handshake
5c7d35ba0 Add UNPROT_DEAUTH command for testing OCV
f91e68e90 OCV: Perform an SA Query after a channel switch
f9da7505b OCV: Include and verify OCI in SA Query frames
dd8df6af0 OCV: Include and verify OCI in the FT handshake
aed61c4ef OCV: Verify OCI in 4-way and group key handshake
1034f67bf OCV: Add function to derive Tx parameters to a specific STA
697652085 OCV: Add function to verify a received OCI element
f53aeff41 OCV: Parse all types of OCI information elements
17c2559ca OCV: Insert OCI in 4-way and group key handshake
6ab73efa7 OCV: Add utility functions to insert OCI elements
55c12f5d3 OCV: Advertise OCV capability in RSN capabilities (STA)
1e93e4239 OCV: Track STA OCV capability in AP mode
875ab60d7 OCV: Advertise OCV capability in RSN capabilities (AP)
ce6829c28 OCV: Add wpa_supplicant config parameter
9c55fdb02 OCV: Add hostapd config parameter
138205d60 OCV: Add build configuration for channel validation support
b1d05aee8 OCV: Protocol definitions
ad20a1367 Store the VHT Operation element of an associated STA
d706e0d7a Add functions to convert channel bandwidth to an integer
dbe473fd2 Add utility function to derive operating class and channel
bef4d07a2 Make channel_info available to authenticator
4b62b52e5 Make channel_info available to the supplicant state machine
7f00dc6e1 Add driver API to get current channel parameters
183a6c93c HS 2.0 server: Allow policy to be set for SIM provisioning
89ae35833 HS 2.0 server: SIM provisioning exchange
7bd8c76a4 HS 2.0 server: RADIUS server support for SIM provisioning
79fec6a92 EAP: Make method and IMSI available from server structures
fb2dc898d WMM AC: Fix a typo in a comment
22d8bb04d WMM AC: Do not write ERROR level log entries when WMM AC is not in use
06c00e6d9 OWE: Fix OWE network profile saving
ad6a92472 DPP: Support DPP key_mgmt saving to wpa_supplicant configuration
3ce48c440 HS 2.0: Fix PMF-in-use check for ANQP Venue URL processing
f44d760cf HS 2.0: Enable PMF automatically for Hotspot 2.0 network profiles
f3784a6b9 HS 2.0: Reject Hotspot 2.0 Rel 2 or newer association without PMF
9ce2015a9 HS 2.0: Allocate enough buffer for HS 2.0 Indication element for scan
2205ca0df HS 2.0: Update supported release number to 3
ec2cf403b HS 2.0: As a STA, do not indicate release number greater than the AP
6ae04d7b3 HS 2.0: Allow Hotspot 2.0 release number to be configured
17adac9ef FILS: Do not process FILS HLP request again while previous one is pending
891e1668c hostapd: Update HE Capabilities and Operation element definition
678d8410a Move send_probe_response parameter to BSS specific items
4c02242d0 Define spectral scaling parameters as QCA vendor specific attributes
f81e65510 WPS NFC: Fix potential NULL pointer dereference on an error path
0e1ab324c HS 2.0 server: Fix couple of memory leaks
718346775 HS 2.0 server: Client certificate reenrollment
d726f4da5 HS 2.0 server: Document client certificate related Apache configuration
2166651b0 HS 2.0 server: Clear remediation requirement for certificate credentials
34341b09b HS 2.0 server: Do not set phase2=1 for certificate-based users
6ff424179 HS 2.0 server: Include phase2=0 users for TLS in the user list
11adf76a7 EAP-TLS server: Update user information based on serial number
9da196adf VLAN: Warn about interface name truncation
f2973fa39 FT: Fix CONFIG_IEEE80211X=y build without CONFIG_FILS=y
368c9dc0b The master branch is now used for v2.8 development
c2c6c01bb Update version to v2.7 and copyright years to include 2018
55570efe3 Uncomment CONFIG_LIBNL32=y in defconfig
698c9e202 OWE: Try another group only on association rejection with status 77
8fc6d8846 OWE: Fix association rejection behavior
bd5124692 nl80211: Debug print TX queue parameter values and result
117f586b0 DPP: Remove unused wpas_dpp_remain_on_channel_cb()
4a450ba20 DPP: Do not reply to PKEX request with identifier if no local identifier
e22c23382 DPP: Apply testing configuration option to signing of own config
8c41734e5 FT: Fix Reassociation Request IEs during FT protocol
e0785ebbb Use more consistent Action frame RX handling in both AP mode paths
ff5010113 FT: Check session_timeout pointer consistently
10c83475b Fix hostapd testing functionality for setting key/seq
022702844 EAP DB: Use NULL to clear a pointer
810bedf23 DPP: Check own_bi/peer_bi pointers more consistently
3d1d46919 Fix indentation level
3337fc2a1 OpenSSL: Include sha512.h to match function prototypes
b3f99d45d macsec_linux: Make create_transmit_sc() handler use matching arguments
b82fcf06f macsec_linux: Use NULL to clear a pointer
ff7f339cf macsec_qca: Mark macsec_qca_set_transmit_next_pn() static
fcb3f11e4 SAE: Fix external authentication on big endian platforms
a00d65e79 DPP: Reject invalid no-psk/pass legacy configurator parameters
04924b28b OWE: Fix a compiler warning in non-testing build
89b6d8a2f DPP: Fix no-Status protocol testing in Auth Resp error case
acecac4c7 Define QCA_NL80211_VENDOR_SUBCMD_LINK_PROPERTIES also as an event
10d32e2c8 nl80211: Use netlink connect socket for disconnect (ext auth)
18a0508a4 external-auth: Check key_mgmt when selecting SSID
941807f6b drivers: Document struct wpa_signal_info
6e7b4c45f Fix hostapd config file reloading with BSS addition/removal
cabbaac11 Fix a typo in a comment
06e62e11c DPP: Fix a debug print to use quotation marks consistently
11f07f027 DPP: Fix error path handling for GAS Comeback Response building
c7896ef9c DPP: Fix memory leaks in GAS server error path handling
931f7ff65 DPP: Fix GAS client error case handling
d7591aab8 dbus: Expose availability of SHA384 on D-Bus
eb7e74793 dbus: Expose availability of FT on D-Bus
59d59eb0e Revert "D-Bus: Implement Pmf property"
4929d556c mesh: Add Category and Action field to maximum buffer length
25778502d mesh: Fix off-by-one in buf length calculation
2b7f46f1c examples: Fix shellcheck warnings in wps-ap-cli
babdd8d0d nl80211: Use correct u8 size for NL80211_ATTR_SMPS_MODE
cd676ae34 Fix dpp_configurator_get_key command name in hostapd_cli
adbce7443 HS 2.0: Update HS2.0 AP version RADIUS attribute Version field
dc673aec4 HS 2.0: Generate AssocReq OSEN IE based on AP advertisement
d55440214 Define new QCA vendor command for coex priority config
a626fb107 Add QCA vendor event to indicate throughput changes
5d332a13f Add test config QCA vendor attribute for action frame Tx in TB PPDU
a94aab6dd Define test config QCA vendor attribute for HE SU PPDU Tx config
292bce08b Define test config QCA vendor attribute for HE OM control config
ab3ab5075 HS 2.0: Fix Terms and Conditions URL handling
0f0aa2a64 OCE: Move OCE checks to IE formation from hostapd initialization
1695b4dc3 HS 2.0: Do not require devinfo.xml for all hs20-osu-client operations
d514b5026 WNM: Collocated Interference Reporting
224eddb03 nl80211: Read reg-domain information from a specific wiphy
8aa4d5521 nl80211: Add support for self-managed regulatory device
ac1f59156 Enable the close-on-exec flag for the debug log file descriptor
1737eb398 Create debug log file with more sane file permissions
f13aaf33f AP: Place the WPA IE in the correct order
170244a1c SME: Fix order of WPA IE in association request
7b2ca5cf0 hostapd: Reset channel switch parameters on interface disable
2f186d598 Define vendor specific NDP attribute for peer NDPE support
ba7d3fe92 HS 2.0: Record policy update into users table
4939e2bb9 HS 2.0: Rename PPS/Credential1 node to Cred01
950cafafb HS 2.0: Fix SubscriptionUpdate UpdateMethod value in OSU server
55e5084d9 HS 2.0: OSU server test functionality for incorrect behavior (policy)
a9574f0f9 HS 2.0: OSU server test functionality for incorrect behavior
de7bcb9bc HS 2.0: Reject PPS MO if polupd or AAA trust root is invalid
68500d815 AP: Warn about VLAN interface name truncations
d577f7f3d nl80211: Warn about interface name truncations
94919da24 RSN: Use COMPACT_MACSTR to match MAC2STR
86a6f5f88 WMM: Update WMM parameter advertisement on the fly
391d922bc EAP-pwd peer: Fix memory leak in eap_pwd_perform_confirm_exchange()
72a09d43f Fix 5 GHz to 2.4 GHz channel switch with hostapd through DISABLE/ENABLE
edb28006c PMF: Do not start SA Query procedure if there is no association
ac0ac1ddf wpa_supplicant: Fix buffer overflow in roaming_consortiums
40432e6eb nl80211: Implement netlink extended ACK support
74eebe93d SAE: Do not ignore option sae_require_mfp
dc1b1c8db Drop logging priority for handle_auth_cb no-STA-match messages
6588f7122 Reduce undesired logging of ACL rejection events from AP mode
c04562e67 OWE: Improve discovery of OWE transition mode AP
a5e6270f2 OWE: Use shorter scan interval during transition mode search
91073ccaa OWE: Attempt more scans for OWE transition SSID if expected BSS not seen
e8581183f HS 2.0: Use execve() with custom env PATH to launch browser using 'am'
77fcd7475 QCA vendor subcommand and attributes to configure capture of CFR data
cc5f79759 HS 2.0 server: Subscription remediation with user selected new password
f718e5e22 HS 2.0 server: Show whether credential is machine managed
eb83e81e3 HS 2.0 server: Make user list more readable
af284f8a8 HS 2.0 server: Clarify signup page options
dd76afff6 HS 2.0 server: Do not perform subrem if not requested to
7770a9dd6 RADIUS: Support last_msk with EAP-TLS
063cbb87a EAP server: Add eap_get_serial_num()
0ec3e77a1 TLS: Add tls_connection_peer_serial_num()
18003b315 AS: Add an event_cb() callback handler
2ff952a5d OpenSSL: Make serial number of peer certificate available in event_cb
ee598e431 HS 2.0 server: Add last_msk into users table setup
2fd8984b0 HS 2.0: Reject OSU connection for Single SSID case without OSU_NAI
2f158bc19 HS 2.0: Use alternative OSU_NAI information in hs20-osu-client
baf4c8637 HS 2.0: Request and process OSU Providers NAI List ANQP-element
cad810a98 HS 2.0: OSU Provider NAI List advertisement
edb509d49 Add QCA vendor event to report roam scan events
cf94626c5 OWE: Do not try to enable PMF for non-RSN associations
17d4b7747 RSN: Do not replace existing Suite B PMKSA on 4-way handshake
4d1f7b685 HS 2.0: Remove hs20-osu-client debug file Cert/est-resp.raw
bd88ed60f eap_proxy: Fix memory leaks when using eap_peer_erp_init()
820ea0ba9 DPP: Fix a memory leak on Configurator keygen error path
5a052f92e DPP: Fix a memory leak in L derivation
bae282e3e DPP: Fix an error path memory leak in URI public key parsing
e66226016 Free dh_ctx on failure in wps_nfc_gen_dh()
50b77f50e DPP: Flush PMKSA if an assoc reject without timeout is received
60377efcc QCA vendor command support for TWT test configuration
2b92c4f3c DPP: Fix test functionality for invalid keys with OpenSSL 1.1.0
cc6263ef6 HS 2.0 server: Store device MAC address into database
3ecb8a520 ANQP: Parse and report Venue URL information
1d73531fd HS 2.0: Fix T&C server database check
25f3c270d HS 2.0: Allow OSU SSID selection to be enforced for testing purposes
b275c3ae5 HS 2.0: Use shared SSID (if available) for OSU by default
075926ec7 HS 2.0: Add alternative OSU_SSID into providers info file
ad4e4f60a RADIUS server: Add testing support for authentication result
ad5c385db HS 2.0 server: Replace deprecated PHP function split()
02eec9954 XML: Do not add empty Value node for nodes with child nodes in TNDS
13dd13fc0 Define test config attribute to configure OM control support

Change-Id: I02037814ecf05d7a51b7413f800880b0650a77c3

1 files changed, 12 insertions, 0 deletions

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index fc13a57b..4432ec31 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1646,6 +1646,10 @@ static void wpas_ext_capab_byte(struct wpa_supplicant *wpa_s, u8 *pos, int idx)
 	case 0: /* Bits 0-7 */
 		break;
 	case 1: /* Bits 8-15 */
+		if (wpa_s->conf->coloc_intf_reporting) {
+			/* Bit 13 - Collocated Interference Reporting */
+			*pos |= 0x20;
+		}
 		break;
 	case 2: /* Bits 16-23 */
 #ifdef CONFIG_WNM
@@ -3076,6 +3080,11 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
 				"MFP: require MFP");
 			params.mgmt_frame_protection =
 				MGMT_FRAME_PROTECTION_REQUIRED;
+#ifdef CONFIG_OWE
+		} else if (!rsn && (ssid->key_mgmt & WPA_KEY_MGMT_OWE) &&
+			   !ssid->owe_only) {
+			params.mgmt_frame_protection = NO_MGMT_FRAME_PROTECTION;
+#endif /* CONFIG_OWE */
 		}
 	}
 #endif /* CONFIG_IEEE80211W */
@@ -3303,6 +3312,7 @@ static void wpa_supplicant_enable_one_network(struct wpa_supplicant *wpa_s,
 		return;
 
 	ssid->disabled = 0;
+	ssid->owe_transition_bss_select_count = 0;
 	wpas_clear_temp_disabled(wpa_s, ssid, 1);
 	wpas_notify_network_enabled_changed(wpa_s, ssid);
 
@@ -3567,6 +3577,8 @@ void wpa_supplicant_select_network(struct wpa_supplicant *wpa_s,
 	wpa_s->disconnected = 0;
 	wpa_s->reassociate = 1;
 	wpa_s->last_owe_group = 0;
+	if (ssid)
+		ssid->owe_transition_bss_select_count = 0;
 
 	if (wpa_s->connect_without_scan ||
 	    wpa_supplicant_fast_associate(wpa_s) != 1) {