qcacld-3.0: Fix code style of action oui

Fix the indentation of the 3rd parameter for all of qdf_str_lcopy() calls.

Replace the magic numbers with action_oui_id enums in the destination array
index for entries 0-6.

To align with out software architecture the umac code should not be calling
ucfg (user configuration) APIs, these should only be called by HDD/OSIF.
Instead the action oui component should export an inter-component API
wlan_action_oui_* which this function calls.
Change the implementation of the ucfg_ api to call the wlan_ API.

Change-Id: Id75eb6bd1ceb8031ccd0cc9c2f5826872969dc6f
CRs-Fixed: 3192204

components/action_oui/core/inc/wlan_action_oui_main.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -76,4 +77,29 @@ action_oui_psoc_create_notification(struct wlan_objmgr_psoc *psoc, void *arg);
 QDF_STATUS
 action_oui_psoc_destroy_notification(struct wlan_objmgr_psoc *psoc, void *arg);
 
+/**
+ * wlan_action_oui_search() - Check for OUIs and related info in IE data.
+ * @psoc: objmgr psoc object
+ * @attr: pointer to structure containing type of action, beacon IE data etc.,
+ * @action_id: type of action to be checked
+ *
+ * This is a wrapper function which invokes internal function to search
+ * for OUIs and related info (specified from ini file) in vendor specific
+ * data of beacon IE for given action.
+ *
+ * Return: If search is successful return true else false.
+ */
+#ifdef WLAN_FEATURE_ACTION_OUI
+bool wlan_action_oui_search(struct wlan_objmgr_psoc *psoc,
+			    struct action_oui_search_attr *attr,
+			    enum action_oui_id action_id);
+#else
+static inline
+bool wlan_action_oui_search(struct wlan_objmgr_psoc *psoc,
+			    struct action_oui_search_attr *attr,
+			    enum action_oui_id action_id)
+{
+	return false;
+}
+#endif
 #endif /* end  of _WLAN_ACTION_OUI_MAIN_H_ */

components/action_oui/core/src/wlan_action_oui_main.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012-2018, 2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -196,3 +197,34 @@ exit:
 	ACTION_OUI_EXIT();
 	return status;
 }
+
+bool wlan_action_oui_search(struct wlan_objmgr_psoc *psoc,
+			    struct action_oui_search_attr *attr,
+			    enum action_oui_id action_id)
+{
+	struct action_oui_psoc_priv *psoc_priv;
+	bool found = false;
+
+	if (!psoc || !attr) {
+		action_oui_err("Invalid psoc or search attrs");
+		goto exit;
+	}
+
+	if (action_id >= ACTION_OUI_MAXIMUM_ID) {
+		action_oui_err("Invalid action_oui id: %u", action_id);
+		goto exit;
+	}
+
+	psoc_priv = action_oui_psoc_get_priv(psoc);
+	if (!psoc_priv) {
+		action_oui_err("psoc priv is NULL");
+		goto exit;
+	}
+
+	found = action_oui_search(psoc_priv, attr, action_id);
+
+exit:
+
+	return found;
+}
+

components/action_oui/dispatcher/src/wlan_action_oui_ucfg_api.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012-2018, 2020-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -22,7 +23,6 @@
 
 #include "wlan_action_oui_ucfg_api.h"
 #include "wlan_action_oui_main.h"
-#include "wlan_action_oui_main.h"
 #include "target_if_action_oui.h"
 #include "wlan_action_oui_tgt_api.h"
 #include <qdf_str.h>
@@ -168,28 +168,5 @@ bool ucfg_action_oui_search(struct wlan_objmgr_psoc *psoc,
 			    struct action_oui_search_attr *attr,
 			    enum action_oui_id action_id)
 {
-	struct action_oui_psoc_priv *psoc_priv;
-	bool found = false;
-
-	if (!psoc || !attr) {
-		action_oui_err("Invalid psoc or search attrs");
-		goto exit;
-	}
-
-	if (action_id >= ACTION_OUI_MAXIMUM_ID) {
-		action_oui_err("Invalid action_oui id: %u", action_id);
-		goto exit;
-	}
-
-	psoc_priv = action_oui_psoc_get_priv(psoc);
-	if (!psoc_priv) {
-		action_oui_err("psoc priv is NULL");
-		goto exit;
-	}
-
-	found = action_oui_search(psoc_priv, attr, action_id);
-
-exit:
-
-	return found;
+	return wlan_action_oui_search(psoc, attr, action_id);
 }

core/hdd/src/wlan_hdd_main.c

@@ -13334,47 +13334,47 @@ static void hdd_cfg_params_init(struct hdd_context *hdd_ctx)
 	config->advertise_concurrent_operation =
 				cfg_get(psoc,
 					CFG_ADVERTISE_CONCURRENT_OPERATION);
-	qdf_str_lcopy(config->action_oui_str[0],
+	qdf_str_lcopy(config->action_oui_str[ACTION_OUI_CONNECT_1X1],
 		      cfg_get(psoc, CFG_ACTION_OUI_CONNECT_1X1),
-			      ACTION_OUI_MAX_STR_LEN);
-	qdf_str_lcopy(config->action_oui_str[1],
+		      ACTION_OUI_MAX_STR_LEN);
+	qdf_str_lcopy(config->action_oui_str[ACTION_OUI_ITO_EXTENSION],
 		      cfg_get(psoc, CFG_ACTION_OUI_ITO_EXTENSION),
-			      ACTION_OUI_MAX_STR_LEN);
-	qdf_str_lcopy(config->action_oui_str[2],
+		      ACTION_OUI_MAX_STR_LEN);
+	qdf_str_lcopy(config->action_oui_str[ACTION_OUI_CCKM_1X1],
 		      cfg_get(psoc, CFG_ACTION_OUI_CCKM_1X1),
-			      ACTION_OUI_MAX_STR_LEN);
-	qdf_str_lcopy(config->action_oui_str[3],
+		      ACTION_OUI_MAX_STR_LEN);
+	qdf_str_lcopy(config->action_oui_str[ACTION_OUI_ITO_ALTERNATE],
 		      cfg_get(psoc, CFG_ACTION_OUI_ITO_ALTERNATE),
-			      ACTION_OUI_MAX_STR_LEN);
-	qdf_str_lcopy(config->action_oui_str[4],
+		      ACTION_OUI_MAX_STR_LEN);
+	qdf_str_lcopy(config->action_oui_str[ACTION_OUI_SWITCH_TO_11N_MODE],
 		      cfg_get(psoc, CFG_ACTION_OUI_SWITCH_TO_11N_MODE),
-			      ACTION_OUI_MAX_STR_LEN);
-	qdf_str_lcopy(config->action_oui_str[5],
+		      ACTION_OUI_MAX_STR_LEN);
+	qdf_str_lcopy(config->action_oui_str[ACTION_OUI_CONNECT_1X1_WITH_1_CHAIN],
 		      cfg_get(psoc,
 			      CFG_ACTION_OUI_CONNECT_1X1_WITH_1_CHAIN),
-			      ACTION_OUI_MAX_STR_LEN);
-	qdf_str_lcopy(config->action_oui_str[6],
+		      ACTION_OUI_MAX_STR_LEN);
+	qdf_str_lcopy(config->action_oui_str[ACTION_OUI_DISABLE_AGGRESSIVE_TX],
 		      cfg_get(psoc,
 			      CFG_ACTION_OUI_DISABLE_AGGRESSIVE_TX),
-			      ACTION_OUI_MAX_STR_LEN);
+		      ACTION_OUI_MAX_STR_LEN);
 	qdf_str_lcopy(config->action_oui_str[ACTION_OUI_FORCE_MAX_NSS],
 		      cfg_get(psoc, CFG_ACTION_OUI_FORCE_MAX_NSS),
-			      ACTION_OUI_MAX_STR_LEN);
+		      ACTION_OUI_MAX_STR_LEN);
 	qdf_str_lcopy(config->action_oui_str
 					  [ACTION_OUI_DISABLE_AGGRESSIVE_EDCA],
 		      cfg_get(psoc,
 			      CFG_ACTION_OUI_DISABLE_AGGRESSIVE_EDCA),
-			      ACTION_OUI_MAX_STR_LEN);
+		      ACTION_OUI_MAX_STR_LEN);
 	qdf_str_lcopy(config->action_oui_str[ACTION_OUI_DISABLE_MU_EDCA],
 		      cfg_get(psoc,
 			      CFG_ACTION_OUI_DISABLE_MU_EDCA),
 		      ACTION_OUI_MAX_STR_LEN);
 	qdf_str_lcopy(config->action_oui_str[ACTION_OUI_DISABLE_TWT],
 		      cfg_get(psoc, CFG_ACTION_OUI_DISABLE_TWT),
-			      ACTION_OUI_MAX_STR_LEN);
+		      ACTION_OUI_MAX_STR_LEN);
 	qdf_str_lcopy(config->action_oui_str[ACTION_OUI_HOST_RECONN],
 		      cfg_get(psoc, CFG_ACTION_OUI_RECONN_ASSOCTIMEOUT),
-			      ACTION_OUI_MAX_STR_LEN);
+		      ACTION_OUI_MAX_STR_LEN);
 
 	config->is_unit_test_framework_enabled =
 			cfg_get(psoc, CFG_ENABLE_UNIT_TEST_FRAMEWORK);

core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c

@@ -49,8 +49,7 @@
 #include <lim_mlo.h>
 #include "parser_api.h"
 #include "wlan_twt_cfg_ext_api.h"
-#include "wlan_action_oui_ucfg_api.h"
-#include "wlan_action_oui_public_struct.h"
+#include "wlan_action_oui_main.h"
 
 /**
  * lim_update_stads_htcap() - Updates station Descriptor HT capability
@@ -1369,7 +1368,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 	if (lim_is_session_he_capable(session_entry)) {
 		attr.ie_data = ie;
 		attr.ie_length = ie_len;
-		bad_ap = ucfg_action_oui_search(mac_ctx->psoc,
+		bad_ap = wlan_action_oui_search(mac_ctx->psoc,
 						&attr,
 						ACTION_OUI_DISABLE_MU_EDCA);
 		session_entry->mu_edca_present = assoc_rsp->mu_edca_present;

core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -58,7 +58,7 @@
 #include "../../core/src/vdev_mgr_ops.h"
 #include "wma.h"
 #include <../../core/src/wlan_cm_vdev_api.h>
-#include <wlan_action_oui_ucfg_api.h>
+#include "wlan_action_oui_main.h"
 #include <wlan_cm_api.h>
 #include <wlan_mlme_api.h>
 #include <wlan_mlme_ucfg_api.h>
@@ -1791,9 +1791,9 @@ static void lim_check_oui_and_update_session(struct mac_context *mac_ctx,
 	vendor_ap_search_attr.enable_5g =
 				wlan_reg_is_5ghz_ch_freq(bss_desc->chan_freq);
 
-	force_max_nss = ucfg_action_oui_search(mac_ctx->psoc,
-					&vendor_ap_search_attr,
-					ACTION_OUI_FORCE_MAX_NSS);
+	force_max_nss = wlan_action_oui_search(mac_ctx->psoc,
+					       &vendor_ap_search_attr,
+					       ACTION_OUI_FORCE_MAX_NSS);
 
 	if (!mac_ctx->mlme_cfg->vht_caps.vht_cap_info.enable2x2) {
 		force_max_nss = false;
@@ -1811,7 +1811,7 @@ static void lim_check_oui_and_update_session(struct mac_context *mac_ctx,
 	 * WMI_VDEV_PARAM_ABG_MODE_TX_CHAIN_NUM
 	 */
 	is_vendor_ap_present =
-			ucfg_action_oui_search(mac_ctx->psoc,
+			wlan_action_oui_search(mac_ctx->psoc,
 					       &vendor_ap_search_attr,
 					       ACTION_OUI_CCKM_1X1);
 	if (is_vendor_ap_present) {
@@ -1827,7 +1827,7 @@ static void lim_check_oui_and_update_session(struct mac_context *mac_ctx,
 	 * mode to 11N.
 	 */
 	is_vendor_ap_present =
-		ucfg_action_oui_search(mac_ctx->psoc,
+		wlan_action_oui_search(mac_ctx->psoc,
 				       &vendor_ap_search_attr,
 				       ACTION_OUI_SWITCH_TO_11N_MODE);
 	if (mac_ctx->roam.configParam.is_force_1x1 &&
@@ -1838,19 +1838,19 @@ static void lim_check_oui_and_update_session(struct mac_context *mac_ctx,
 	     session->dot11mode == MLME_DOT11_MODE_11AC_ONLY))
 		session->dot11mode = MLME_DOT11_MODE_11N;
 
-	follow_ap_edca = ucfg_action_oui_search(mac_ctx->psoc,
-				    &vendor_ap_search_attr,
-				    ACTION_OUI_DISABLE_AGGRESSIVE_EDCA);
+	follow_ap_edca = wlan_action_oui_search(mac_ctx->psoc,
+						&vendor_ap_search_attr,
+						ACTION_OUI_DISABLE_AGGRESSIVE_EDCA);
 	mlme_set_follow_ap_edca_flag(session->vdev, follow_ap_edca);
 
-	if (ucfg_action_oui_search(mac_ctx->psoc, &vendor_ap_search_attr,
+	if (wlan_action_oui_search(mac_ctx->psoc, &vendor_ap_search_attr,
 				   ACTION_OUI_HOST_RECONN)) {
 		mlme_set_reconn_after_assoc_timeout_flag(
 			mac_ctx->psoc, session->vdev_id,
 			true);
 	}
 	is_vendor_ap_present =
-			ucfg_action_oui_search(mac_ctx->psoc,
+			wlan_action_oui_search(mac_ctx->psoc,
 					       &vendor_ap_search_attr,
 					       ACTION_OUI_CONNECT_1X1);
 
@@ -1870,9 +1870,9 @@ static void lim_check_oui_and_update_session(struct mac_context *mac_ctx,
 
 	if (!is_vendor_ap_present) {
 		is_vendor_ap_present =
-			ucfg_action_oui_search(mac_ctx->psoc,
-				&vendor_ap_search_attr,
-				ACTION_OUI_CONNECT_1X1_WITH_1_CHAIN);
+			wlan_action_oui_search(mac_ctx->psoc,
+					       &vendor_ap_search_attr,
+					       ACTION_OUI_CONNECT_1X1_WITH_1_CHAIN);
 		if (is_vendor_ap_present)
 			pe_debug("1x1 with 1 Chain AP");
 	}