Переглянути джерело

qcacld-3.0: Refactor one mlme sta INI

Based on new cfg component, refactor CFG_TX_POWER_CTRL_NAME and clean
up related legacy codes.

Change-Id: I6dd317d5065c4111b71a9fe94d9b9af1f7d3d664
CRs-Fixed: 2355918
Wu Gao 6 роки тому
батько
коміт
7e3d41f467

+ 1 - 0
mlme/core/src/wlan_mlme_main.c

@@ -1216,6 +1216,7 @@ static void mlme_init_sta_cfg(struct wlan_objmgr_psoc *psoc,
 		(uint32_t)cfg_default(CFG_WT_CNF_TIMEOUT);
 		(uint32_t)cfg_default(CFG_WT_CNF_TIMEOUT);
 	sta->current_rssi =
 	sta->current_rssi =
 		(uint32_t)cfg_default(CFG_CURRENT_RSSI);
 		(uint32_t)cfg_default(CFG_CURRENT_RSSI);
+	sta->allow_tpc_from_ap = cfg_get(psoc, CFG_TX_POWER_CTRL);
 }
 }
 
 
 static void mlme_init_lfr_cfg(struct wlan_objmgr_psoc *psoc,
 static void mlme_init_lfr_cfg(struct wlan_objmgr_psoc *psoc,

+ 24 - 1
mlme/dispatcher/inc/cfg_mlme_sta.h

@@ -375,6 +375,28 @@
 	CFG_VALUE_OR_DEFAULT, \
 	CFG_VALUE_OR_DEFAULT, \
 	"Current RSSI")
 	"Current RSSI")
 
 
+/*
+ * <ini>
+ * gAllowTPCfromAP - Support for AP power constraint
+ * @Min: 0
+ * @Max: 1
+ * @Default: 1
+ *
+ * This ini controls driver to honor/dishonor power constraint from AP.
+ *
+ * Related: None.
+ *
+ * Supported Feature: Concurrency
+ *
+ * Usage: Internal/External
+ *
+ * </ini>
+ */
+#define CFG_TX_POWER_CTRL CFG_INI_BOOL( \
+	"gAllowTPCfromAP", \
+	1, \
+	"Support for AP power constraint")
+
 #define CFG_STA_ALL \
 #define CFG_STA_ALL \
 	CFG(CFG_INFRA_STA_KEEP_ALIVE_PERIOD) \
 	CFG(CFG_INFRA_STA_KEEP_ALIVE_PERIOD) \
 	CFG(CFG_TGT_GTX_USR_CFG) \
 	CFG(CFG_TGT_GTX_USR_CFG) \
@@ -390,6 +412,7 @@
 	CFG(CFG_FORCE_RSNE_OVERRIDE) \
 	CFG(CFG_FORCE_RSNE_OVERRIDE) \
 	CFG(CFG_SINGLE_TID_RC) \
 	CFG(CFG_SINGLE_TID_RC) \
 	CFG(CFG_WT_CNF_TIMEOUT) \
 	CFG(CFG_WT_CNF_TIMEOUT) \
-	CFG(CFG_CURRENT_RSSI)
+	CFG(CFG_CURRENT_RSSI) \
+	CFG(CFG_TX_POWER_CTRL)
 
 
 #endif /* CFG_MLME_STA_H__ */
 #endif /* CFG_MLME_STA_H__ */

+ 2 - 0
mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -1020,6 +1020,7 @@ struct wlan_mlme_nss_chains {
  * @qcn_ie_support:                 QCN IE support
  * @qcn_ie_support:                 QCN IE support
  * @force_rsne_override:            Force rsnie override from user
  * @force_rsne_override:            Force rsnie override from user
  * @single_tid:                     Set replay counter for all TID
  * @single_tid:                     Set replay counter for all TID
+ * @allow_tpc_from_ap:              Support for AP power constraint
  */
  */
 struct wlan_mlme_sta_cfg {
 struct wlan_mlme_sta_cfg {
 	uint32_t sta_keep_alive_period;
 	uint32_t sta_keep_alive_period;
@@ -1037,6 +1038,7 @@ struct wlan_mlme_sta_cfg {
 	bool qcn_ie_support;
 	bool qcn_ie_support;
 	bool force_rsne_override;
 	bool force_rsne_override;
 	bool single_tid;
 	bool single_tid;
+	bool allow_tpc_from_ap;
 };
 };
 
 
 /*
 /*