Merge 5c6a445b03b4957c2f3e67165db1b379fc6d00b7 on remote branch (624ec38c) · Commits · e / devices / android_kernel_oneplus_sm7250

components/action_oui/dispatcher/inc/wlan_action_oui_public_struct.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@
		* @ACTION_OUI_DISABLE_AGGRESSIVE_TX: disable aggressive TX in firmware
		* @ACTION_OUI_FORCE_MAX_NSS: Force Max NSS connection with few IOT APs
		* @ACTION_OUI_DISABLE_AGGRESSIVE_EDCA: disable aggressive EDCA with the ap
		* @ACTION_OUI_DISABLE_TWT: disable TWT with the ap
		* @ACTION_OUI_HOST_ONLY: host only action id start - placeholder.
		* New Firmware related "ACTION" needs to be added before this placeholder.
		* @ACTION_OUI_HOST_RECONN: reconnect to the same BSSID when wait for
		@@ -106,6 +107,7 @@ enum action_oui_id {
		ACTION_OUI_DISABLE_AGGRESSIVE_TX = 6,
		ACTION_OUI_FORCE_MAX_NSS = 7,
		ACTION_OUI_DISABLE_AGGRESSIVE_EDCA = 8,
		ACTION_OUI_DISABLE_TWT = 9,
		ACTION_OUI_HOST_ONLY,
		ACTION_OUI_HOST_RECONN = ACTION_OUI_HOST_ONLY,
		ACTION_OUI_MAXIMUM_ID

+6 −1

Original line number	Diff line number	Diff line
		@@ -1811,6 +1811,8 @@ static void mlme_init_scoring_cfg(struct wlan_objmgr_psoc *psoc,
		cfg_get(psoc, CFG_SCORING_CHAN_CONGESTION_WEIGHTAGE);
		scoring_cfg->weight_cfg.oce_wan_weightage =
		cfg_get(psoc, CFG_SCORING_OCE_WAN_WEIGHTAGE);
		scoring_cfg->weight_cfg.sae_pk_ap_weightage =
		cfg_get(psoc, CFG_SAE_PK_AP_WEIGHTAGE);

		total_weight = scoring_cfg->weight_cfg.rssi_weightage +
		scoring_cfg->weight_cfg.ht_caps_weightage +
		@@ -1822,7 +1824,8 @@ static void mlme_init_scoring_cfg(struct wlan_objmgr_psoc *psoc,
		scoring_cfg->weight_cfg.beamforming_cap_weightage +
		scoring_cfg->weight_cfg.pcl_weightage +
		scoring_cfg->weight_cfg.channel_congestion_weightage +
		scoring_cfg->weight_cfg.oce_wan_weightage;
		scoring_cfg->weight_cfg.oce_wan_weightage +
		scoring_cfg->weight_cfg.sae_pk_ap_weightage;

		/*
		* If configured weights are greater than max weight,
		@@ -1848,6 +1851,8 @@ static void mlme_init_scoring_cfg(struct wlan_objmgr_psoc *psoc,
		scoring_cfg->weight_cfg.channel_congestion_weightage =
		CHANNEL_CONGESTION_WEIGHTAGE;
		scoring_cfg->weight_cfg.oce_wan_weightage = OCE_WAN_WEIGHTAGE;
		scoring_cfg->weight_cfg.sae_pk_ap_weightage =
		SAE_PK_AP_WEIGHTAGE;
		}

		scoring_cfg->rssi_score.best_rssi_threshold =

+31 −0

Original line number	Diff line number	Diff line
		@@ -321,6 +321,36 @@
		CFG_VALUE_OR_DEFAULT, \
		"OCE WAN Weightage")

		/*
		*
		* sae_pk_ap_weightage - update scoring param based on SAE PK ap weightage
		* @Min: 0
		* @Max: 10
		* @Default: 3
		*
		* This ini is used to calculate SAE PK ap weightage in roam score. SAE Public
		* Key (SAE-PK) authentication is an extension of SAE that is intended for use
		* cases where authentication is based on a password that might be
		* distributed to or obtained by a potential adversary. With SAE-PK, the AP in
		* an infrastructure network is additionally authenticated based on a static
		* public/private key pair. This ini is also used for WFA certification.
		*
		* Related: None
		*
		* Supported Feature: STA
		*
		* Usage: External
		*
		* </ini>
		*/
		#define CFG_SAE_PK_AP_WEIGHTAGE CFG_INI_UINT( \
		"sae_pk_ap_weightage", \
		0, \
		10, \
		PLATFORM_VALUE(3, 0), \
		CFG_VALUE_OR_DEFAULT,\
		"SAE-PK AP weightage")

		/*
		* <ini>
		* best_rssi_threshold - Best Rssi for score calculation
		@@ -1294,6 +1324,7 @@
		CFG(CFG_SCORING_PCL_WEIGHTAGE) \
		CFG(CFG_SCORING_CHAN_CONGESTION_WEIGHTAGE) \
		CFG(CFG_SCORING_OCE_WAN_WEIGHTAGE) \
		CFG(CFG_SAE_PK_AP_WEIGHTAGE) \
		CFG(CFG_SCORING_BEST_RSSI_THRESHOLD) \
		CFG(CFG_SCORING_GOOD_RSSI_THRESHOLD) \
		CFG(CFG_SCORING_BAD_RSSI_THRESHOLD) \

+2 −0

Original line number	Diff line number	Diff line
		@@ -1859,6 +1859,7 @@ struct wlan_mlme_wmm_params {
		* @pcl_weightage: PCL weightage
		* @channel_congestion_weightage: channel congestion weightage
		* @oce_wan_weightage: OCE WAN metrics weightage
		* @sae_pk_ap_weightage: SAE-PK AP weigtage
		*/
		struct wlan_mlme_weight_config {
		uint8_t rssi_weightage;
		@@ -1872,6 +1873,7 @@ struct wlan_mlme_weight_config {
		uint8_t pcl_weightage;
		uint8_t channel_congestion_weightage;
		uint8_t oce_wan_weightage;
		uint8_t sae_pk_ap_weightage;
		};

		/**

+38 −0

Original line number	Diff line number	Diff line
		@@ -1292,6 +1292,43 @@ struct dhcp_server {
		"00E04C 00 01", \
		"Used to specify action OUIs to reconnect when assoc timeout")

		/*
		* <ini>
		* gActionOUIDisableTWT - Used to specify action OUIs to control TWT param
		* while joining the candidate AP
		*
		* This ini is used to specify AP OUIs. Some APs advertise TWT but do not
		* follow through when the STA reaches out to them. Thus, TWT will be
		* disabled when we receive OUIs of those APs.
		* Note: User should strictly add new action OUIs at the end of this
		* default value.
		*
		* Default OUIs: (All values in Hex)
		* OUI 1: 001018
		* OUI data Len: 00
		* Info Mask : 01 - only OUI present in Info mask
		*
		* OUI 2: 000986
		* OUI data Len: 00
		* Info Mask : 01 - only OUI present in Info mask
		*
		* Refer to gEnableActionOUI for more detail about the format.
		*
		* Related: gEnableActionOUI
		*
		* Supported Feature: Action OUIs
		*
		* Usage: External
		*
		* </ini>
		*/
		#define CFG_ACTION_OUI_DISABLE_TWT CFG_INI_STRING( \
		"gActionOUIDisableTWT", \
		0, \
		ACTION_OUI_MAX_STR_LEN, \
		"001018 00 01 000986 00 01", \
		"Used to specify action OUIs to control TWT configuration")

		/* End of action oui inis */

		#ifdef ENABLE_MTRACE_LOG
		@@ -1647,6 +1684,7 @@ enum host_log_level {
		CFG(CFG_ACTION_OUI_DISABLE_AGGRESSIVE_EDCA) \
		CFG(CFG_ACTION_OUI_SWITCH_TO_11N_MODE) \
		CFG(CFG_ACTION_OUI_RECONN_ASSOCTIMEOUT) \
		CFG(CFG_ACTION_OUI_DISABLE_TWT) \
		CFG(CFG_ADVERTISE_CONCURRENT_OPERATION) \
		CFG(CFG_BUG_ON_REINIT_FAILURE) \
		CFG(CFG_DBS_SCAN_SELECTION) \