Merge bc6d87c5b958fd250056f9a5a438043541d276a4 on remote branch (32e08e5a) · Commits · e / devices / android_kernel_fairphone_FP3

Android.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -11,11 +11,9 @@ endif

		# Build/Package options for 8916, 8974, 8226, 8610, 8909, 8952, 8937, 8953 targets
		ifneq (,$(filter msm8916 msm8974 msm8226 msm8610 msm8909 msm8952 msm8937 msm8953 titanium,$(TARGET_BOARD_PLATFORM)))
		ifneq ($(TARGET_SUPPORTS_ANDROID_WEAR_KERNEL_4_14),true)
		WLAN_CHIPSET := pronto
		WLAN_SELECT := CONFIG_PRONTO_WLAN=m
		endif
		endif

		# Build/Package only in case of supported target
		ifneq ($(WLAN_CHIPSET),)

CORE/DXE/src/wlan_qct_dxe.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -4826,7 +4826,8 @@ void *WLANDXE_Open
		* Init State is
		* Clear TX Enable
		* RING EMPTY STATE */
		smsmInitState = wpalNotifySmsm(WPAL_SMSM_WLAN_TX_ENABLE,
		smsmInitState = wpalNotifySmsm(WPAL_SMSM_WLAN_TX_ENABLE \|
		WPAL_SMSM_WLAN_TX_RINGS_EMPTY,
		WPAL_SMSM_WLAN_TX_RINGS_EMPTY);
		if(0 != smsmInitState)
		{

CORE/HDD/inc/wlan_hdd_cfg.h

+26 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
		*
		* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
		*
		@@ -890,7 +890,7 @@ typedef enum
		#define CFG_PER_BSSID_BLACKLIST_TIMEOUT_NAME "gBssidBlacklistTimeOut"
		#define CFG_PER_BSSID_BLACKLIST_TIMEOUT_MIN (0)
		#define CFG_PER_BSSID_BLACKLIST_TIMEOUT_MAX (240) //Max timeout
		#define CFG_PER_BSSID_BLACKLIST_TIMEOUT_DEFAULT (10)
		#define CFG_PER_BSSID_BLACKLIST_TIMEOUT_DEFAULT (0)
		#endif // FEATURE_WLAN_LFR

		#if defined (WLAN_FEATURE_VOWIFI_11R) \|\| defined (FEATURE_WLAN_ESE) \|\| defined(FEATURE_WLAN_LFR)
		@@ -3294,6 +3294,29 @@ This feature requires the dependent cfg.ini "gRoamPrefer5GHz" set to 1 */
		#define CFG_IS_SAE_ENABLED_MIN (0)
		#define CFG_IS_SAE_ENABLED_MAX (1)

		/*
		* <ini>
		* enable_sae_for_sap - Enable/Disable SAE support in driver for SAP
		* @Min: 0
		* @Max: 1
		* @Default: 1
		*
		* This ini is used to enable/disable SAE support in driver for SAP mode
		* Driver will process/drop the SAE authentication frames based on this config.
		*
		* Related: None
		*
		* Supported Feature: SAE
		* Usage: External
		*
		* </ini>
		*/

		#define CFG_ENABLE_SAE_FOR_SAP_NAME "enable_sae_for_sap"
		#define CFG_ENABLE_SAE_FOR_SAP_DEFAULT (1)
		#define CFG_ENABLE_SAE_FOR_SAP_MIN (0)
		#define CFG_ENABLE_SAE_FOR_SAP_MAX (1)

		/*---------------------------------------------------------------------------
		Type declarations
		-------------------------------------------------------------------------*/
		@@ -3912,6 +3935,7 @@ typedef struct
		char enabledefaultSAP[CFG_CONCURRENT_IFACE_MAX_LEN];
		#ifdef WLAN_FEATURE_SAE
		bool is_sae_enabled;
		bool enable_sae_for_sap;
		#endif
		#ifdef FEATURE_WLAN_LFR
		uint8_t bssid_blacklist_timeout;

CORE/HDD/inc/wlan_hdd_cfg80211.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -2119,4 +2119,9 @@ void wlan_hdd_cfg80211_scan_randomization_init(struct wiphy *wiphy)
		}
		#endif

		#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))
		#define nla_parse(a, b, c, d, e) nla_parse(a, b, c, d, e, NULL)
		#define cfg80211_sched_scan_results(a) cfg80211_sched_scan_results(a, 0)
		#endif

		#endif

CORE/HDD/inc/wlan_hdd_hostapd.h

+2 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
		* Copyright (c) 2013-2017, 2020 The Linux Foundation. All rights reserved.
		*
		* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
		*
		@@ -81,7 +81,7 @@ void hdd_softap_tkip_mic_fail_counter_measure(hdd_adapter_t*,v_BOOL_t);
		int hdd_softap_unpackIE( tHalHandle halHandle,
		eCsrEncryptionType *pEncryptType,
		eCsrEncryptionType *mcEncryptType,
		eCsrAuthType *pAuthType,
		tCsrAuthList *akm_list,
		v_BOOL_t *pMFPCapable,
		v_BOOL_t *pMFPRequired,
		u_int16_t gen_ie_len,