Browse Source

qcacld-3.0: Remove legacy INI items of QOS aggregation configs

Remove the legacy INI code from hdd_cfg. Replace the existing
access from hdd_config with new mlme api.

Change-Id: Iddde15330c1ad39a59bd9a3c7ea86af971df61b5
CRs-Fixed: 2313296
Pragaspathi Thilagaraj 6 years ago
parent
commit
280aae6e95

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

@@ -26,6 +26,8 @@
 #include <wlan_objmgr_psoc_obj.h>
 #include <wlan_cmn.h>
 
+#include "sme_api.h"
+
 /**
  * wlan_mlme_get_ht_cap_info() - Get the HT cap info config
  * @psoc: pointer to psoc object
@@ -48,6 +50,18 @@ QDF_STATUS wlan_mlme_set_ht_cap_info(struct wlan_objmgr_psoc *psoc,
 				     struct mlme_ht_capabilities_info
 				     ht_cap_info);
 
+/**
+ *
+ * wlan_mlme_get_sap_inactivity_override() - Check if sap max inactivity
+ * override flag is set.
+ * @psoc: pointer to psoc object
+ * @sme_config - Sme config struct
+ *
+ * Return: QDF Status
+ */
+void wlan_mlme_get_sap_inactivity_override(struct wlan_objmgr_psoc *psoc,
+					   bool *value);
+
 /**
  * wlan_mlme_get_ignore_peer_ht_mode() - Get the ignore peer ht opmode flag
  * @psoc: pointer to psoc object

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

@@ -171,7 +171,6 @@ struct wlan_mlme_rates {
  * struct wlan_mlme_sap_protection_cfg - SAP erp protection config items
  *
  * @protection_enabled - Force enable protection. static via cfg
- * @protection_always_11g - Force protection enable for 11g. 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.
  *

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

@@ -149,6 +149,25 @@ 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_sap_inactivity_override() - Check if sap max inactivity
+ * override flag is set.
+ * @psoc: pointer to psoc object
+ * @sme_config - Sme config struct
+ *
+ * Inline UCFG API to be used by HDD/OSIF callers to call
+ * the mlme function wlan_mlme_get_sap_inactivity_override
+ *
+ * Return: QDF Status
+ */
+static inline
+void ucfg_mlme_get_sap_inactivity_override(struct wlan_objmgr_psoc *psoc,
+					   bool *value)
+{
+	wlan_mlme_get_sap_inactivity_override(psoc, value);
+}
+
 /**
  * ucfg_mlme_get_ignore_peer_ht_mode() - Get the ignore peer ht mode flag
  *

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

@@ -59,6 +59,19 @@ QDF_STATUS wlan_mlme_set_ht_cap_info(struct wlan_objmgr_psoc *psoc,
 	return QDF_STATUS_SUCCESS;
 }
 
+void wlan_mlme_get_sap_inactivity_override(struct wlan_objmgr_psoc *psoc,
+					   bool *val)
+{
+	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;
+	}
+	*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)
 {