prima: CAF tag 'LA.UM.6.6.r1-08500-89xx.0' (c66378c2) · Commits · e / devices / android_kernel_xiaomi_markw

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,13 @@
		#endif
		#endif

		/*
		* Max number of supported csa_counters in beacons
		* and probe responses. Set to the same value as
		* IEEE80211_MAX_CSA_COUNTERS_NUM
		*/
		#define WLAN_HDD_MAX_NUM_CSA_COUNTERS 2

		#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) \
		\|\| defined(BACKPORTED_CHANNEL_SWITCH_PRESENT)
		#define CHANNEL_SWITCH_SUPPORTED
		@@ -121,6 +128,9 @@
		#define NUM_RADIOS 0x1
		#endif /* WLAN_FEATURE_LINK_LAYER_STATS */

		#define WOWL_PTRN_MAX_SIZE 128
		#define WOWL_PTRN_MASK_MAX_SIZE 16
		#define WOWL_MAX_PTRNS_ALLOWED 16

		typedef struct {
		u8 element_id;
		@@ -1407,6 +1417,9 @@ enum qca_wlan_vendor_config {
		QCA_WLAN_VENDOR_ATTR_CONFIG_FINE_TIME_MEASUREMENT,
		QCA_WLAN_VENDOR_ATTR_CONFIG_TX_RATE,
		QCA_WLAN_VENDOR_ATTR_CONFIG_PENALIZE_AFTER_NCONS_BEACON_MISS,

		/* 8-bit unsigned value to trigger QPower: 1-Enable, 0-Disable */
		QCA_WLAN_VENDOR_ATTR_CONFIG_QPOWER = 25,
		/* 8-bit unsigned value to set the beacon miss threshold in 2.4 GHz */
		QCA_WLAN_VENDOR_ATTR_CONFIG_BEACON_MISS_THRESHOLD_24 = 37,
		/* 8-bit unsigned value to set the beacon miss threshold in 5 GHz */

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -1483,13 +1483,13 @@ struct hdd_fw_mem_dump_req_ctx {
		* callback type to check fw mem dump request.Called from SVC
		* context and update status in HDD.
		*/
		typedef void (hdd_fw_mem_dump_req_cb)(struct hdd_fw_mem_dump_req_ctx );
		typedef void (hdd_fw_mem_dump_req_cb)(void context);

		int memdump_init(void);
		int memdump_deinit(void);
		void wlan_hdd_fw_mem_dump_cb(void ,tAniFwrDumpRsp );
		int wlan_hdd_fw_mem_dump_req(hdd_context_t * pHddCtx);
		void wlan_hdd_fw_mem_dump_req_cb(struct hdd_fw_mem_dump_req_ctx*);
		void wlan_hdd_fw_mem_dump_req_cb(void *context);
		#ifdef WLAN_FEATURE_LINK_LAYER_STATS
		/**
		* struct hdd_ll_stats_context - hdd link layer stats context
		@@ -1775,6 +1775,7 @@ struct hdd_context_s
		*/
		vos_timer_t tx_rx_trafficTmr;
		v_U8_t drvr_miracast;
		bool is_vowifi_enabled;
		v_U8_t issplitscan_enabled;
		v_U8_t isTdlsScanCoexistence;

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -343,6 +343,11 @@ typedef struct ccp_freq_chan_map_s{
		v_U32_t chan;
		}hdd_freq_chan_map_t;

		struct stats_class_a_ctx {
		tCsrGlobalClassAStatsInfo class_a_stats;
		};


		#define wlan_hdd_get_wps_ie_ptr(ie, ie_len) \
		wlan_hdd_get_vendor_oui_ie_ptr(WPS_OUI_TYPE, WPS_OUI_TYPE_SIZE, ie, ie_len)

		@@ -421,7 +426,7 @@ extern int hdd_priv_get_data(struct iw_point *p_priv_data,
		extern void mem_alloc_copy_from_user_helper(const void wrqu_data, size_t len);

		void hdd_clearRoamProfileIe( hdd_adapter_t *pAdapter);
		void hdd_GetClassA_statisticsCB(void pStats, void pContext);
		void hdd_get_class_a_statistics_cb(void stats, void context);

		VOS_STATUS wlan_hdd_check_ula_done(hdd_adapter_t *pAdapter);

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

+13 −4

Original line number	Diff line number	Diff line
		@@ -494,7 +494,7 @@ void hdd_copy_ht_caps(struct ieee80211_ht_cap *hdd_ht_cap,
		ANTENNA_SEL_INFO_TX_SOUNDING_PPDU;

		/* mcs data rate */
		for (i = 0; i < IEEE80211_HT_MCS_MASK_LEN; ++i)
		for (i = 0; i < IEEE80211_HT_MCS_MASK_LEN; ++i) {
		hdd_ht_cap->mcs.rx_mask[i] =
		roam_ht_cap->supportedMCSSet[i];

		@@ -503,7 +503,7 @@ void hdd_copy_ht_caps(struct ieee80211_ht_cap *hdd_ht_cap,
		((short) (roam_ht_cap->supportedMCSSet[10]));
		hdd_ht_cap->mcs.tx_params =
		roam_ht_cap->supportedMCSSet[12];

		}
		}


		@@ -540,7 +540,7 @@ void hdd_copy_vht_caps(struct ieee80211_vht_cap *hdd_vht_cap,
		temp_vht_cap = roam_vht_cap->supportedChannelWidthSet &
		(IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK >>
		VHT_CAP_SUPP_CHAN_WIDTH_MASK_SHIFT);
		if (temp_vht_cap)
		if (temp_vht_cap) {
		if (roam_vht_cap->supportedChannelWidthSet &
		(IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ >>
		VHT_CAP_SUPP_CHAN_WIDTH_MASK_SHIFT))
		@@ -553,6 +553,7 @@ void hdd_copy_vht_caps(struct ieee80211_vht_cap *hdd_vht_cap,
		hdd_vht_cap->vht_cap_info \|=
		temp_vht_cap <<
		IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ;
		}
		if (roam_vht_cap->ldpcCodingCap)
		hdd_vht_cap->vht_cap_info \|= IEEE80211_VHT_CAP_RXLDPC;
		if (roam_vht_cap->shortGI80MHz)
		@@ -4631,10 +4632,18 @@ static tANI_S32 hdd_ProcessGENIE(hdd_adapter_t *pAdapter,
		pRsnIe = gen_ie + 2 + 4;
		RSNIeLen = gen_ie_len - (2 + 4);
		// Unpack the WPA IE
		dot11fUnpackIeWPA((tpAniSirGlobal) halHandle,
		status = dot11fUnpackIeWPA((tpAniSirGlobal) halHandle,
		pRsnIe,
		RSNIeLen,
		&dot11WPAIE);
		if (DOT11F_FAILED(status))
		{
		hddLog(LOGE,
		FL("Parse failure in hdd_ProcessGENIE (0x%08x)"),
		status);
		return -EINVAL;
		}

		// Copy out the encryption and authentication types
		hddLog(LOG1, FL("%s: WPA unicast cipher suite count: %d"),
		__func__, dot11WPAIE.unicast_cipher_count );

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -4088,6 +4088,7 @@ static char i_trim(char str)
		/* Find the last non white-space */
		ptr += strlen(ptr) - 1;
		for (; ptr != str && i_isspace(*ptr); ptr--);

		/* Null terminate the following character */
		ptr[1] = '\0';

		@@ -5598,6 +5599,9 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx )

		if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_MCAST_BCAST_FILTER_SETTING, pConfig->mcastBcastFilterSetting,
		NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
		{
		}

		#endif

		if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_SINGLE_TID_RC, pConfig->bSingleTidRc,