qcacld-3.0: Use converged qcacmn macros (part 1)

Replace the existing qcacld-3.0 macros with qcacmn converged
macros.

Change-Id: Ie05f396fcd2e01cf86256f25dbc171bbdf763da9
CRs-Fixed: 2416429

mlme/core/src/wlan_mlme_main.c

@@ -1833,21 +1833,25 @@ static void mlme_init_nss_chains(struct wlan_objmgr_psoc *psoc,
 static void mlme_init_wep_keys(struct wlan_mlme_wep_cfg *wep_params)
 {
 	/* initialize the default key values to zero */
-	wep_params->wep_default_key_1.len = MLME_WEP_KEY_LEN_13;
-	wep_params->wep_default_key_1.max_len = MLME_WEP_KEY_LEN_13;
-	qdf_mem_zero(wep_params->wep_default_key_1.data, MLME_WEP_KEY_LEN_13);
-
-	wep_params->wep_default_key_2.len = MLME_WEP_KEY_LEN_13;
-	wep_params->wep_default_key_2.max_len = MLME_WEP_KEY_LEN_13;
-	qdf_mem_zero(wep_params->wep_default_key_2.data, MLME_WEP_KEY_LEN_13);
-
-	wep_params->wep_default_key_3.len = MLME_WEP_KEY_LEN_13;
-	wep_params->wep_default_key_3.max_len = MLME_WEP_KEY_LEN_13;
-	qdf_mem_zero(wep_params->wep_default_key_3.data, MLME_WEP_KEY_LEN_13);
-
-	wep_params->wep_default_key_4.len = MLME_WEP_KEY_LEN_13;
-	wep_params->wep_default_key_4.max_len = MLME_WEP_KEY_LEN_13;
-	qdf_mem_zero(wep_params->wep_default_key_4.data, MLME_WEP_KEY_LEN_13);
+	wep_params->wep_default_key_1.len = WLAN_CRYPTO_KEY_WEP104_LEN;
+	wep_params->wep_default_key_1.max_len = WLAN_CRYPTO_KEY_WEP104_LEN;
+	qdf_mem_zero(wep_params->wep_default_key_1.data,
+		     WLAN_CRYPTO_KEY_WEP104_LEN);
+
+	wep_params->wep_default_key_2.len = WLAN_CRYPTO_KEY_WEP104_LEN;
+	wep_params->wep_default_key_2.max_len = WLAN_CRYPTO_KEY_WEP104_LEN;
+	qdf_mem_zero(wep_params->wep_default_key_2.data,
+		     WLAN_CRYPTO_KEY_WEP104_LEN);
+
+	wep_params->wep_default_key_3.len = WLAN_CRYPTO_KEY_WEP104_LEN;
+	wep_params->wep_default_key_3.max_len = WLAN_CRYPTO_KEY_WEP104_LEN;
+	qdf_mem_zero(wep_params->wep_default_key_3.data,
+		     WLAN_CRYPTO_KEY_WEP104_LEN);
+
+	wep_params->wep_default_key_4.len = WLAN_CRYPTO_KEY_WEP104_LEN;
+	wep_params->wep_default_key_4.max_len = WLAN_CRYPTO_KEY_WEP104_LEN;
+	qdf_mem_zero(wep_params->wep_default_key_4.data,
+		     WLAN_CRYPTO_KEY_WEP104_LEN);
 }
 
 static void mlme_init_wep_cfg(struct wlan_mlme_wep_cfg *wep_params)

mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -1785,9 +1785,6 @@ struct wlan_mlme_oce {
 	uint8_t feature_bitmap;
 };
 
-#define MLME_WEP_KEY_LEN_13 (13)
-#define MLME_WEP_KEY_LENGTH_5 (5)
-
 /**
  * enum wep_key_id  - values passed to get/set wep default keys
  * @MLME_WEP_DEFAULT_KEY_1: wep default key 1

p2p/core/src/wlan_p2p_off_chan_tx.c

@@ -206,10 +206,10 @@ static const uint8_t *p2p_get_p2pie_from_probe_rsp(
 	ie_len = tx_ctx->buf_len - PROBE_RSP_IE_OFFSET;
 	p2p_ie = p2p_get_p2pie_ptr(ie, ie_len);
 	while ((p2p_ie) &&
-		(P2P_MAX_IE_LENGTH == p2p_ie[1])) {
+		(WLAN_MAX_IE_LEN == p2p_ie[1])) {
 		ie_len = tx_ctx->buf_len - (p2p_ie - tx_ctx->buf);
 		if (ie_len > 2) {
-			ie = p2p_ie + P2P_MAX_IE_LENGTH + 2;
+			ie = p2p_ie + WLAN_MAX_IE_LEN + 2;
 			tmp_p2p_ie = p2p_get_p2pie_ptr(ie, ie_len);
 		}
 
@@ -467,12 +467,12 @@ static uint16_t p2p_update_noa_stream(struct tx_action_context *tx_ctx,
 		p2p_ie[1] = orig_len;
 	}
 
-	if ((p2p_ie[1] + noa_len) > P2P_MAX_IE_LENGTH) {
+	if ((p2p_ie[1] + noa_len) > WLAN_MAX_IE_LEN) {
 		overflow_len = p2p_ie[1] + noa_len -
-				P2P_MAX_IE_LENGTH;
+				WLAN_MAX_IE_LEN;
 		noa_len = p2p_get_noa_attr_stream_in_mult_p2p_ies(
 				noa_stream, noa_len, overflow_len);
-		p2p_ie[1] = P2P_MAX_IE_LENGTH;
+		p2p_ie[1] = WLAN_MAX_IE_LEN;
 	} else {
 		/* increment the length of P2P IE */
 		p2p_ie[1] += noa_len;

p2p/core/src/wlan_p2p_off_chan_tx.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2019 The Linux Foundation. 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
@@ -36,7 +36,6 @@
 
 #define P2P_MAX_NOA_ATTR_LEN                    31
 #define P2P_IE_HEADER_LEN                       6
-#define P2P_MAX_IE_LENGTH                       255
 #define P2P_ACTION_OFFSET                       24
 #define P2P_PUBLIC_ACTION_FRAME_TYPE_OFFSET     30
 #define P2P_ACTION_FRAME_TYPE_OFFSET            29