prima: LA.UM.6.6.r1-11000-89xx.0 (5fe0b556) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/staging/prima/CORE/HDD/inc/wlan_hdd_cfg.h

+25 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
		*
		* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
		*
		@@ -61,6 +61,12 @@
		#define WLAN_PSK_STRING_LENGTH (64)
		#endif /* SAP_AUTH_OFFLOAD */

		/*
		* Maximum length of the default SAP interface created using
		* gEnabledefaultSAP ini param.
		*/
		#define CFG_CONCURRENT_IFACE_MAX_LEN 16

		// Defines for all of the things we read from the configuration (registry).

		#define CFG_RTS_THRESHOLD_NAME "RTSThreshold"
		@@ -3248,6 +3254,23 @@ This feature requires the dependent cfg.ini "gRoamPrefer5GHz" set to 1 */
		#define CFG_FORCE_RSNE_OVERRIDE_MAX (1)
		#define CFG_FORCE_RSNE_OVERRIDE_DEFAULT (0)

		/*
		* <ini>
		* gEnabledefaultSAP - This will control the creation of default SAP
		* interface
		* @Default: NULL
		*
		* This ini is used for providing control to create a default SAP session
		* along with the creation of wlan0 and p2p0. The name of the interface is
		* specified as the parameter
		*
		* Usage: External
		*
		* </ini>
		*/
		#define CFG_ENABLE_DEFAULT_SAP "gEnabledefaultSAP"
		#define CFG_ENABLE_DEFAULT_SAP_DEFAULT ""

		/*---------------------------------------------------------------------------
		Type declarations
		-------------------------------------------------------------------------*/
		@@ -3864,7 +3887,7 @@ typedef struct
		uint32_t btc_dyn_num_bt_ext;
		bool indoor_channel_support;
		bool force_rsne_override;

		char enabledefaultSAP[CFG_CONCURRENT_IFACE_MAX_LEN];
		} hdd_config_t;

		/*---------------------------------------------------------------------------

drivers/staging/prima/CORE/HDD/inc/wlan_hdd_cfg80211.h

+20 −0

Original line number	Diff line number	Diff line
		@@ -1900,4 +1900,24 @@ VOS_STATUS wlan_hdd_send_sta_authorized_event(hdd_adapter_t *adapter,
		*/
		int wlan_hdd_disconnect(hdd_adapter_t *pAdapter, u16 reason);

		#if defined(CFG80211_SCAN_RANDOM_MAC_ADDR) \|\| \
		(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
		/**
		* wlan_hdd_cfg80211_scan_randomization_init() - Enable NL80211 scan randomize
		* @wiphy: Pointer to wiphy structure
		*
		* This function is used to enable NL80211 scan randomization feature when
		* ini: gEnableMacAddrSpoof is set to MAC_ADDR_SPOOFING_FW_HOST_ENABLE and
		* cfg80211 supports scan randomization.
		*
		* Return: None
		*/
		void wlan_hdd_cfg80211_scan_randomization_init(struct wiphy *wiphy);
		#else
		static inline
		void wlan_hdd_cfg80211_scan_randomization_init(struct wiphy *wiphy)
		{
		}
		#endif

		#endif

drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg.c

+10 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
		*
		* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
		*
		@@ -4035,6 +4035,11 @@ REG_VARIABLE( CFG_EXTSCAN_ENABLE, WLAN_PARAM_Integer,
		CFG_FORCE_RSNE_OVERRIDE_MIN,
		CFG_FORCE_RSNE_OVERRIDE_MAX),

		REG_VARIABLE_STRING(CFG_ENABLE_DEFAULT_SAP, WLAN_PARAM_String,
		hdd_config_t, enabledefaultSAP,
		VAR_FLAGS_NONE,
		(void *)CFG_ENABLE_DEFAULT_SAP_DEFAULT),

		};

		/*
		@@ -4709,6 +4714,10 @@ static void print_hdd_cfg(hdd_context_t *pHddCtx)
		"Name = [%s] Value = [%u] ",
		CFG_FORCE_RSNE_OVERRIDE_NAME,
		pHddCtx->cfg_ini->force_rsne_override);
		VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
		"Name = [%s] Value = [%s] ",
		CFG_ENABLE_DEFAULT_SAP,
		pHddCtx->cfg_ini->enabledefaultSAP);
		}

drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c

+230 −18

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
		*
		* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
		*
		@@ -2796,6 +2796,14 @@ static int __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy,
		FL("HDD adapter is Null"));
		return -ENODEV;
		}

		if (pAdapter->device_mode != WLAN_HDD_INFRA_STATION) {
		hddLog(VOS_TRACE_LEVEL_DEBUG,
		"Cannot set LL_STATS for device mode %d",
		pAdapter->device_mode);
		return -EINVAL;
		}

		/* check the LLStats Capability */
		if ( (TRUE != pHddCtx->cfg_ini->fEnableLLStats) \|\|
		(TRUE != sme_IsFeatureSupportedByFW(LINK_LAYER_STATS_MEAS)))
		@@ -9099,6 +9107,20 @@ void hdd_add_channel_switch_support(struct wiphy *wiphy)
		}
		#endif

		#if defined(CFG80211_SCAN_RANDOM_MAC_ADDR) \|\| \
		(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
		void wlan_hdd_cfg80211_scan_randomization_init(struct wiphy *wiphy)
		{
		hdd_context_t *hdd_ctx = wiphy_priv(wiphy);
		hdd_config_t *config = hdd_ctx->cfg_ini;

		if (config->enableMacSpoofing != MAC_ADDR_SPOOFING_FW_HOST_ENABLE)
		return;

		wiphy->features \|= NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR;
		}
		#endif

		/*
		* FUNCTION: wlan_hdd_cfg80211_init
		* This function is called by hdd_wlan_startup()
		@@ -15198,6 +15220,207 @@ static inline void csr_scan_request_assign_bssid(tCsrScanRequest *scanRequest,
		}
		#endif

		#if defined(CFG80211_SCAN_RANDOM_MAC_ADDR) \|\| \
		(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
		/**
		* hdd_is_wiphy_scan_random_support() - Check NL80211 scan randomization support
		* @wiphy: Pointer to wiphy structure
		*
		* This function is used to check whether @wiphy supports
		* NL80211 scan randomization feature.
		*
		* Return: If randomization is supported then return true else false.
		*/
		static bool
		hdd_is_wiphy_scan_random_support(struct wiphy *wiphy)
		{
		if (wiphy->features & NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR)
		return true;

		return false;
		}

		/**
		* hdd_is_nl_scan_random() - Check for randomization flag in cfg80211 scan
		* @nl_scan: cfg80211 scan request
		*
		* This function is used to check whether scan randomization flag is set for
		* current cfg80211 scan request identified by @nl_scan.
		*
		* Return: If randomization flag is set then return true else false.
		*/
		static bool
		hdd_is_nl_scan_random(struct cfg80211_scan_request *nl_scan)
		{
		if (nl_scan->flags & NL80211_SCAN_FLAG_RANDOM_ADDR)
		return true;

		return false;
		}
		#else
		static bool
		hdd_is_wiphy_scan_random_support(struct wiphy *wiphy)
		{
		return false;
		}

		static bool
		hdd_is_nl_scan_random(struct cfg80211_scan_request *nl_scan)
		{
		return false;
		}
		#endif

		/**
		* hdd_generate_scan_random_mac() - Generate Random mac addr for cfg80211 scan
		* @mac_addr: Input mac-addr from which random-mac address is to be generated
		* @mac_mask: Bits of mac_addr which should not be randomized
		* @random_mac: Output pointer to hold generated random mac address
		*
		* This function is used generate random mac address using @mac_addr and
		* @mac_mask with following logic:
		* Bit value 0 in the mask means that we should randomize that bit.
		* Bit value 1 in the mask means that we should take specific bit value
		* from mac address provided.
		*
		* Return: None
		*/
		static void
		hdd_generate_scan_random_mac(uint8_t mac_addr, uint8_t mac_mask,
		uint8_t *random_mac)
		{
		uint32_t i;
		uint8_t random_byte;

		for (i = 0; i < VOS_MAC_ADDRESS_LEN; i++) {
		random_byte = 0;
		get_random_bytes(&random_byte, 1);
		random_mac[i] = (mac_addr[i] & mac_mask[i]) \|
		(random_byte & (~(mac_mask[i])));
		}

		/*
		* Make sure locally administered bit is set if that
		* particular bit in the mask is 0
		*/
		if (!(mac_mask[0] & 0x2))
		random_mac[0] \|= 0x2;

		/*
		* Make sure multicast/group address bit is NOT set if that
		* particular bit in the mask is 0
		*/
		if (!(mac_mask[0] & 0x1))
		random_mac[0] &= ~0x1;
		}

		/**
		* hdd_spoof_scan() - Spoof cfg80211 scan
		* @wiphy: Pointer to wiphy
		* @adapter: Pointer to adapter for which scan is requested
		* @nl_scan: Cfg80211 scan request
		* @is_p2p_scan: Check for p2p scan
		* @csr_scan: Pointer to internal (csr) scan request
		*
		* This function is used for following purposes:
		* (a) If cfg80211 supports scan randomization then this function invokes helper
		* functions to generate random-mac address.
		* (b) If the cfg80211 doesn't support scan randomization then randomize scans
		* using spoof mac received with VENDOR_SUBCMD_MAC_OUI.
		* (c) Configure the random-mac in transport layer.
		*
		* Return: For success return 0 else return negative value.
		*/
		static int
		hdd_spoof_scan(struct wiphy wiphy, hdd_adapter_t adapter,
		struct cfg80211_scan_request *nl_scan,
		bool is_p2p_scan, tCsrScanRequest *csr_scan)
		{
		hdd_context_t *hdd_ctx = wiphy_priv(wiphy);
		hdd_config_t *config = hdd_ctx->cfg_ini;
		uint8_t random_mac[VOS_MAC_ADDRESS_LEN];
		VOS_STATUS vos_status;
		eHalStatus hal_status;

		csr_scan->nl_scan = true;
		csr_scan->scan_randomize = false;

		if (config->enableMacSpoofing != MAC_ADDR_SPOOFING_FW_HOST_ENABLE \|\|
		!sme_IsFeatureSupportedByFW(MAC_SPOOFED_SCAN))
		return 0;

		vos_flush_delayed_work(&hdd_ctx->spoof_mac_addr_work);

		if (hdd_is_wiphy_scan_random_support(wiphy)) {
		if (!hdd_is_nl_scan_random(nl_scan) \|\| is_p2p_scan)
		return 0;

		hdd_generate_scan_random_mac(nl_scan->mac_addr,
		nl_scan->mac_addr_mask,
		random_mac);

		hddLog(VOS_TRACE_LEVEL_INFO,
		FL("cfg80211 scan random attributes:"));
		hddLog(VOS_TRACE_LEVEL_INFO, "mac-addr: "MAC_ADDRESS_STR
		" mac-mask: "MAC_ADDRESS_STR
		" random-mac: "MAC_ADDRESS_STR,
		MAC_ADDR_ARRAY(nl_scan->mac_addr),
		MAC_ADDR_ARRAY(nl_scan->mac_addr_mask),
		MAC_ADDR_ARRAY(random_mac));

		hal_status = sme_SpoofMacAddrReq(hdd_ctx->hHal,
		(v_MACADDR_t *)random_mac,
		false);
		if (hal_status != eHAL_STATUS_SUCCESS) {
		hddLog(LOGE,
		FL("Send of Spoof request failed"));
		hddLog(LOGE,
		FL("Disable spoofing and use self-mac"));
		return 0;
		}

		vos_status = WLANTL_updateSpoofMacAddr(hdd_ctx->pvosContext,
		(v_MACADDR_t*)random_mac,
		&adapter->macAddressCurrent);
		if(vos_status != VOS_STATUS_SUCCESS) {
		hddLog(VOS_TRACE_LEVEL_ERROR,
		FL("Failed to update spoof mac in TL"));
		return -EINVAL;
		}

		csr_scan->scan_randomize = true;

		return 0;
		}

		/*
		* If wiphy does not support cfg80211 scan randomization then scan
		* will be randomized using the vendor MAC OUI.
		*/
		if (!hdd_ctx->spoofMacAddr.isEnabled)
		return 0;

		hddLog(VOS_TRACE_LEVEL_INFO,
		FL("MAC Spoofing enabled for current scan and spoof addr is:"
		MAC_ADDRESS_STR),
		MAC_ADDR_ARRAY(hdd_ctx->spoofMacAddr.randomMacAddr.bytes));

		/* Updating SelfSta Mac Addr in TL which will be used to get staidx
		* to fill TxBds for probe request during current scan
		*/
		vos_status = WLANTL_updateSpoofMacAddr(hdd_ctx->pvosContext,
		&hdd_ctx->spoofMacAddr.randomMacAddr, &adapter->macAddressCurrent);
		if(vos_status != VOS_STATUS_SUCCESS) {
		hddLog(VOS_TRACE_LEVEL_ERROR,
		FL("Failed to update spoof mac in TL"));
		return -EINVAL;
		}

		csr_scan->scan_randomize = true;

		return 0;
		}

		/*
		* FUNCTION: __wlan_hdd_cfg80211_scan
		* this scan respond to scan trigger and update cfg80211 scan database
		@@ -15688,19 +15911,8 @@ int __wlan_hdd_cfg80211_scan( struct wiphy *wiphy,
		scanRequest.minChnTime, scanRequest.maxChnTime,
		scanRequest.p2pSearch, scanRequest.skipDfsChnlInP2pSearch);

		if (pHddCtx->spoofMacAddr.isEnabled &&
		pHddCtx->cfg_ini->enableMacSpoofing == 1)
		{
		hddLog(VOS_TRACE_LEVEL_INFO,
		"%s: MAC Spoofing enabled for current scan", __func__);
		/* Updating SelfSta Mac Addr in TL which will be used to get staidx
		* to fill TxBds for probe request during current scan
		*/
		status = WLANTL_updateSpoofMacAddr(pHddCtx->pvosContext,
		&pHddCtx->spoofMacAddr.randomMacAddr, &pAdapter->macAddressCurrent);

		if(status != VOS_STATUS_SUCCESS)
		{
		ret = hdd_spoof_scan(wiphy, pAdapter, request, is_p2p_scan, &scanRequest);
		if(ret) {
		hdd_allow_suspend(WIFI_POWER_EVENT_WAKELOCK_SCAN);
		status = -EFAULT;
		#ifdef FEATURE_WLAN_TDLS
		@@ -15708,7 +15920,7 @@ int __wlan_hdd_cfg80211_scan( struct wiphy *wiphy,
		#endif
		goto free_mem;
		}
		}

		wlan_hdd_get_frame_logs(pAdapter, WLAN_HDD_GET_FRAME_LOG_CMD_CLEAR);
		status = sme_ScanRequest( WLAN_HDD_GET_HAL_CTX(pAdapter),
		pAdapter->sessionId, &scanRequest, &scanId,

drivers/staging/prima/CORE/HDD/src/wlan_hdd_main.c

+15 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
		*
		* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
		*
		@@ -13380,6 +13380,7 @@ int hdd_wlan_startup(struct device *dev )
		VOS_STATUS status;
		hdd_adapter_t *pAdapter = NULL;
		hdd_adapter_t *pP2pAdapter = NULL;
		hdd_adapter_t *softapAdapter = NULL;
		hdd_context_t *pHddCtx = NULL;
		v_CONTEXT_t pVosContext= NULL;
		#ifdef WLAN_BTAMP_FEATURE
		@@ -13864,6 +13865,8 @@ int hdd_wlan_startup(struct device *dev )
		goto err_vosstop;
		}

		wlan_hdd_cfg80211_scan_randomization_init(wiphy);

		#ifndef CONFIG_ENABLE_LINUX_REG
		wlan_hdd_cfg80211_update_reg_info( wiphy );

		@@ -13951,6 +13954,17 @@ int hdd_wlan_startup(struct device *dev )
		goto err_close_adapter;
		}

		if ((strlen(pHddCtx->cfg_ini->enabledefaultSAP) != 0) &&
		(strcmp(pHddCtx->cfg_ini->enabledefaultSAP, "") != 0)) {
		softapAdapter = hdd_open_adapter( pHddCtx, WLAN_HDD_SOFTAP,
		pHddCtx->cfg_ini->enabledefaultSAP,
		wlan_hdd_get_intf_addr(pHddCtx), FALSE);
		if (!softapAdapter) {
		hddLog(VOS_TRACE_LEVEL_ERROR, "%s: hdd_open_adapter failed", __func__);
		goto err_close_adapter;
		}
		}

		if (country_code)
		{
		eHalStatus ret;