samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Remove legacy CFG macro definitions

Browse Source 
Remove the legacy macro definitions that are related to the
mlme cfg.
Move them to wlan_mlme_public_struct.h

Change-Id: I64f474512463d3ba7ac238b2efd0f4cf2e36999b
CRs-Fixed: 2317750
This commit is contained in:
Pragaspathi Thilagaraj
2018-09-18 21:38:51 +05:30
committed by nshrivas
parent e258cced61
commit f50fd4b105
4 changed files with 42 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mlme/core/src/wlan_mlme_main.c
View File

@@ -201,7 +201,7 @@ static void mlme_init_sap_protection_cfg(struct wlan_objmgr_psoc *psoc,
cfg_default(CFG_PROTECTION_ENABLED); cfg_default(CFG_PROTECTION_ENABLED);
sap_protection_params->protection_force_policy = sap_protection_params->protection_force_policy =
cfg_default(CFG_FORCE_POLICY_PROTECTION); cfg_default(CFG_FORCE_POLICY_PROTECTION);
sap_protection_params->ignore_peer_ht_mode = sap_protection_params->ignore_peer_ht_opmode =
cfg_get(psoc, CFG_IGNORE_PEER_HT_MODE); cfg_get(psoc, CFG_IGNORE_PEER_HT_MODE);
} }

55
mlme/dispatcher/inc/wlan_mlme_public_struct.h
View File

@@ -184,33 +184,60 @@ struct wlan_mlme_rates {
uint8_t disable_high_ht_mcs_2x2; uint8_t disable_high_ht_mcs_2x2;
}; };
/* Flags for gLimProtectionControl that is updated in pe session*/
#define MLME_FORCE_POLICY_PROTECTION_DISABLE 0
#define MLME_FORCE_POLICY_PROTECTION_CTS 1
#define MLME_FORCE_POLICY_PROTECTION_RTS 2
#define MLME_FORCE_POLICY_PROTECTION_DUAL_CTS 3
#define MLME_FORCE_POLICY_PROTECTION_RTS_ALWAYS 4
#define MLME_FORCE_POLICY_PROTECTION_AUTO 5
/* protection_enabled bits*/
#define MLME_PROTECTION_ENABLED_FROM_llA 0
#define MLME_PROTECTION_ENABLED_FROM_llB 1
#define MLME_PROTECTION_ENABLED_FROM_llG 2
#define MLME_PROTECTION_ENABLED_HT_20 3
#define MLME_PROTECTION_ENABLED_NON_GF 4
#define MLME_PROTECTION_ENABLED_LSIG_TXOP 5
#define MLME_PROTECTION_ENABLED_RIFS 6
#define MLME_PROTECTION_ENABLED_OBSS 7
#define MLME_PROTECTION_ENABLED_OLBC_FROM_llA 8
#define MLME_PROTECTION_ENABLED_OLBC_FROM_llB 9
#define MLME_PROTECTION_ENABLED_OLBC_FROM_llG 10
#define MLME_PROTECTION_ENABLED_OLBC_HT20 11
#define MLME_PROTECTION_ENABLED_OLBC_NON_GF 12
#define MLME_PROTECTION_ENABLED_OLBC_LSIG_TXOP 13
#define MLME_PROTECTION_ENABLED_OLBC_RIFS 14
#define MLME_PROTECTION_ENABLED_OLBC_OBSS 15
/* /*
* struct wlan_mlme_sap_protection_cfg - SAP erp protection config items * struct wlan_mlme_sap_protection_cfg - SAP erp protection config items
* *
* @protection_enabled - Force enable protection. static via cfg * @protection_enabled: Force enable protection. static via cfg
* @protection_force_policy - Protection force policy. Static via cfg * @protection_force_policy: Protection force policy. Static via cfg
* @ignore_peer_ht_mode - ignore the ht opmode of the peer. Dynamic via INI. * @ignore_peer_ht_opmode: Ignore the ht opmode of the peer. Dynamic via INI
* *
*/ */
struct wlan_mlme_sap_protection { struct wlan_mlme_sap_protection {
uint32_t protection_enabled; uint32_t protection_enabled;
uint8_t protection_force_policy; uint8_t protection_force_policy;
bool ignore_peer_ht_mode; bool ignore_peer_ht_opmode;
}; };
/* /*
* struct wlan_mlme_chainmask - All chainmask related cfg items * struct wlan_mlme_chainmask - All chainmask related cfg items
* *
* @txchainmask1x1 - to set transmit chainmask * @txchainmask1x1: To set transmit chainmask
* @rxchainmask1x1 - to set rx chainmask * @rxchainmask1x1: To set rx chainmask
* @tx_chain_mask_cck - Used to enable/disable Cck ChainMask * @tx_chain_mask_cck: Used to enable/disable Cck ChainMask
* @tx_chain_mask_1ss - Enables/disables tx chain Mask1ss * @tx_chain_mask_1ss: Enables/disables tx chain Mask1ss
* @num_11b_tx_chains - Number of Tx Chains in 11b mode * @num_11b_tx_chains: Number of Tx Chains in 11b mode
* @num_11ag_tx_chains - Number of Tx Chains in 11ag mode * @num_11ag_tx_chains: Number of Tx Chains in 11ag mode
* @tx_chain_mask_2g - tx chain mask for 2g * @tx_chain_mask_2g: Tx chain mask for 2g
* @rx_chain_mask_2g - rx chain mask for 2g * @rx_chain_mask_2g: Tx chain mask for 2g
* @tx_chain_mask_5g - tx chain mask for 5g * @tx_chain_mask_5g: Tx chain mask for 5g
* @rx_chain_mask_5g - rx chain mask for 5g * @rx_chain_mask_5g: Rx chain mask for 5g
*/ */
struct wlan_mlme_chainmask { struct wlan_mlme_chainmask {
uint8_t txchainmask1x1; uint8_t txchainmask1x1;

18
mlme/dispatcher/inc/wlan_mlme_ucfg_api.h
View File

@@ -168,24 +168,6 @@ void ucfg_mlme_get_sap_inactivity_override(struct wlan_objmgr_psoc *psoc,
wlan_mlme_get_sap_inactivity_override(psoc, value); wlan_mlme_get_sap_inactivity_override(psoc, value);
} }
/**
* ucfg_mlme_get_ignore_peer_ht_mode() - Get the ignore peer ht mode flag
*
* @psoc: pointer to psoc object
* @value: Value that needs to be set
*
* Inline UCFG API to be used by HDD/OSIF callers to get the
* ignore_peer_ht_opmode flag value
*
* Return: QDF_STATUS_SUCCESS or QDF_STATUS_FAILURE
*/
static inline
QDF_STATUS ucfg_mlme_get_ignore_peer_ht_mode(struct wlan_objmgr_psoc *psoc,
bool *value)
{
return wlan_mlme_get_ignore_peer_ht_mode(psoc, value);
}
/** /**
* ucfg_mlme_get_tx_chainmask_1ss() - Get the tx_chainmask_1ss value * ucfg_mlme_get_tx_chainmask_1ss() - Get the tx_chainmask_1ss value
* *

14
mlme/dispatcher/src/wlan_mlme_api.c
View File

@@ -72,20 +72,6 @@ void wlan_mlme_get_sap_inactivity_override(struct wlan_objmgr_psoc *psoc,
*val = mlme_obj->cfg.qos_mlme_params.sap_max_inactivity_override; *val = mlme_obj->cfg.qos_mlme_params.sap_max_inactivity_override;
} }
QDF_STATUS wlan_mlme_get_ignore_peer_ht_mode(struct wlan_objmgr_psoc *psoc,
bool *value)
{
struct wlan_mlme_psoc_obj *mlme_obj = mlme_get_psoc_obj(psoc);
if (!mlme_obj) {
mlme_err("Failed to get MLME Obj");
return QDF_STATUS_E_FAILURE;
}
*value = mlme_obj->cfg.sap_protection_cfg.ignore_peer_ht_mode;
return QDF_STATUS_SUCCESS;
}
QDF_STATUS wlan_mlme_get_tx_chainmask_cck(struct wlan_objmgr_psoc *psoc, QDF_STATUS wlan_mlme_get_tx_chainmask_cck(struct wlan_objmgr_psoc *psoc,
bool *value) bool *value)
{ {