瀏覽代碼

qcacld-3.0: Update band_capability INI usage with MLME CFG

Replace all usage of band_capability INI from HDD config to MLME CFG

Change-Id: I406a8fb9965fe98a47cc6309d31f5bced529577b
CRs-Fixed: 2327023
Vignesh Viswanathan 6 年之前
父節點
當前提交
18ce2d5e02

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

@@ -161,6 +161,7 @@ static void mlme_init_generic_cfg(struct wlan_objmgr_psoc *psoc,
 	gen->rtt3_enabled = cfg_default(CFG_RTT3_ENABLE);
 	gen->band_capability =
 		cfg_get(psoc, CFG_BAND_CAPABILITY);
+	gen->band = gen->band_capability;
 	gen->select_5ghz_margin =
 		cfg_get(psoc, CFG_SELECT_5GHZ_MARGIN);
 	gen->sub_20_chan_width =

+ 20 - 0
mlme/dispatcher/inc/wlan_mlme_api.h

@@ -177,6 +177,26 @@ QDF_STATUS wlan_mlme_set_ht_cap_info(struct wlan_objmgr_psoc *psoc,
 				     struct mlme_ht_capabilities_info
 				     ht_cap_info);
 
+/**
+ * wlan_mlme_get_band_capability() - Get the Band capability config
+ * @psoc: pointer to psoc object
+ * @band_capability: Pointer to the variable from caller
+ *
+ * Return: QDF Status
+ */
+QDF_STATUS wlan_mlme_get_band_capability(struct wlan_objmgr_psoc *psoc,
+					 uint8_t *band_capability);
+
+/**
+ * wlan_mlme_set_band_capability() - Set the Band capability config
+ * @psoc: pointer to psoc object
+ * @band_capability: Value to be set from the caller
+ *
+ * Return: QDF Status
+ */
+QDF_STATUS wlan_mlme_set_band_capability(struct wlan_objmgr_psoc *psoc,
+					 uint8_t band_capability);
+
 /**
  * wlan_mlme_get_acs_with_more_param() - Get the acs_with_more_param flag
  * @psoc: pointer to psoc object

+ 28 - 0
mlme/dispatcher/inc/wlan_mlme_ucfg_api.h

@@ -149,6 +149,34 @@ QDF_STATUS ucfg_mlme_set_ht_cap_info(struct wlan_objmgr_psoc *psoc,
 	return wlan_mlme_set_ht_cap_info(psoc, ht_cap_info);
 }
 
+/**
+ * ucfg_mlme_get_band_capability() - Get the Band capability config
+ * @psoc: pointer to psoc object
+ * @band_capability: Pointer to the variable from caller
+ *
+ * Return: QDF Status
+ */
+static inline
+QDF_STATUS ucfg_mlme_get_band_capability(struct wlan_objmgr_psoc *psoc,
+					 uint8_t *band_capability)
+{
+	return wlan_mlme_get_band_capability(psoc, band_capability);
+}
+
+/**
+ * ucfg_mlme_set_band_capability() - Set the Band capability config
+ * @psoc: pointer to psoc object
+ * @band_capability: Value to be set from the caller
+ *
+ * Return: QDF Status
+ */
+static inline
+QDF_STATUS ucfg_mlme_set_band_capability(struct wlan_objmgr_psoc *psoc,
+					 uint8_t band_capability)
+{
+	return wlan_mlme_set_band_capability(psoc, band_capability);
+}
+
 /**
  * ucfg_mlme_get_acs_with_more_param() - Get the flag for acs with
  *					 more param

+ 33 - 0
mlme/dispatcher/src/wlan_mlme_api.c

@@ -90,6 +90,39 @@ QDF_STATUS wlan_mlme_set_ht_cap_info(struct wlan_objmgr_psoc *psoc,
 	return QDF_STATUS_SUCCESS;
 }
 
+QDF_STATUS wlan_mlme_get_band_capability(struct wlan_objmgr_psoc *psoc,
+					 uint8_t *band_capability)
+{
+	struct wlan_mlme_psoc_obj *mlme_obj;
+
+	mlme_obj = mlme_get_psoc_obj(psoc);
+	if (!mlme_obj) {
+		mlme_err("Failed to get MLME Obj");
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	*band_capability = mlme_obj->cfg.gen.band_capability;
+
+	return QDF_STATUS_SUCCESS;
+}
+
+QDF_STATUS wlan_mlme_set_band_capability(struct wlan_objmgr_psoc *psoc,
+					 uint8_t band_capability)
+
+{
+	struct wlan_mlme_psoc_obj *mlme_obj;
+
+	mlme_obj = mlme_get_psoc_obj(psoc);
+	if (!mlme_obj) {
+		mlme_err("Failed to get MLME Obj");
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	mlme_obj->cfg.gen.band_capability = band_capability;
+
+	return QDF_STATUS_SUCCESS;
+}
+
 void wlan_mlme_get_sap_inactivity_override(struct wlan_objmgr_psoc *psoc,
 					   bool *val)
 {