From 45a2433bca9141f3acf219381ac9cd4cb7114ee4 Mon Sep 17 00:00:00 2001
From: Jingxiang Ge <jge@codeaurora.org>
Date: Mon, 11 Mar 2019 10:46:47 +0800
Subject: [PATCH] qcacld-3.0: Fix camelCase for sessionId in t_packetmeta

Replace sessionId with session_id in t_packetmeta.

Change-Id: I041d25a5a5f61dd65fea25d41fa11d6456e4e88f
CRs-Fixed: 2413150
---
 core/cds/src/i_cds_packet.h | 6 +++---
 core/wma/inc/wma_types.h    | 2 +-
 core/wma/src/wma_mgmt.c     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/cds/src/i_cds_packet.h b/core/cds/src/i_cds_packet.h
index 24f900fcf9ef..358e15d9a986 100644
--- a/core/cds/src/i_cds_packet.h
+++ b/core/cds/src/i_cds_packet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2016, 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
@@ -53,7 +53,7 @@
  * @scan: Bit set to 1 if packet received during scanning
  * @scan_src: Source of scan
  * @dpuFeedback: DPU feedback for frame
- * @sessionId: PE session
+ * @session_id: PE session
  * @tsf_delta: Delta between tsf in frame and local value of tsf
  * @rssi_raw: rssi based on actual noise floor in hardware.
  */
@@ -72,7 +72,7 @@ typedef struct {
 	uint8_t scan:1;
 	uint8_t scan_src;
 	uint8_t dpuFeedback;
-	uint8_t sessionId;
+	uint8_t session_id;
 	uint32_t tsf_delta;
 	uint32_t rssi_raw;
 } t_packetmeta, *tp_packetmeta;
diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h
index 09de9d307cf3..e3dbfa44f1e4 100644
--- a/core/wma/inc/wma_types.h
+++ b/core/wma/inc/wma_types.h
@@ -91,7 +91,7 @@
 #define WMA_GET_ROAMCANDIDATEIND(pRxMeta) \
 	(((t_packetmeta *)pRxMeta)->roamCandidateInd)
 #define WMA_GET_SESSIONID(pRxMeta) \
-	(((t_packetmeta *)pRxMeta)->sessionId)
+	(((t_packetmeta *)pRxMeta)->session_id)
 #define WMA_GET_SCAN_SRC(pRxMeta) \
 	(((t_packetmeta *)pRxMeta)->scan_src)
 
diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c
index 2214828acb4a..fb3abd72db9f 100644
--- a/core/wma/src/wma_mgmt.c
+++ b/core/wma/src/wma_mgmt.c
@@ -4177,7 +4177,7 @@ int wma_form_rx_packet(qdf_nbuf_t buf,
 		}
 	}
 
-	rx_pkt->pkt_meta.sessionId =
+	rx_pkt->pkt_meta.session_id =
 		(vdev_id == WMA_INVALID_VDEV_ID ? 0 : vdev_id);
 
 	if (mgt_type == IEEE80211_FC0_TYPE_MGT &&
@@ -4204,7 +4204,7 @@ int wma_form_rx_packet(qdf_nbuf_t buf,
 			mgt_subtype != MGMT_SUBTYPE_BEACON) &&
 			packetdump_cb)
 		packetdump_cb(rx_pkt->pkt_buf, QDF_STATUS_SUCCESS,
-			rx_pkt->pkt_meta.sessionId, RX_MGMT_PKT);
+			rx_pkt->pkt_meta.session_id, RX_MGMT_PKT);
 
 	return 0;
 }