qcacld-3.0: Replace typedef dphHashTableClass
The naming and usage of typedef dphHashTableClass does not conform to
the Linux coding style, so replace it with struct dph_hash_table.
Rename dph_hash_table_class_init() as well to match the new naming.
Change-Id: I38df3c01736dfbeff3d51be05582ebfe69c1353b
CRs-Fixed: 2361805
diff --git a/core/mac/src/dph/dph_hash_table.c b/core/mac/src/dph/dph_hash_table.c
index 744cfbf..bc89584 100644
--- a/core/mac/src/dph/dph_hash_table.c
+++ b/core/mac/src/dph/dph_hash_table.c
@@ -36,25 +36,8 @@
#include "wma_if.h"
#include "wlan_mlme_api.h"
-/* --------------------------------------------------------------------- */
-/**
- * dphHashTableClass()
- *
- * FUNCTION:
- * Constructor function
- *
- * LOGIC:
- *
- * ASSUMPTIONS:
- *
- * NOTE:
- *
- * @param None
- * @return None
- */
-
-void dph_hash_table_class_init(struct mac_context *mac,
- dphHashTableClass *pDphHashTable)
+void dph_hash_table_init(struct mac_context *mac,
+ struct dph_hash_table *pDphHashTable)
{
uint16_t i;
@@ -120,7 +103,7 @@
tpDphHashNode dph_lookup_hash_entry(struct mac_context *mac, uint8_t staAddr[],
uint16_t *pAssocId,
- dphHashTableClass *pDphHashTable)
+ struct dph_hash_table *pDphHashTable)
{
tpDphHashNode ptr = NULL;
uint16_t index = hash_function(mac, staAddr, pDphHashTable->size);
@@ -158,7 +141,7 @@
*/
tpDphHashNode dph_get_hash_entry(struct mac_context *mac, uint16_t peerIdx,
- dphHashTableClass *pDphHashTable)
+ struct dph_hash_table *pDphHashTable)
{
if (peerIdx < pDphHashTable->size) {
if (pDphHashTable->pDphNodeArray[peerIdx].added)
@@ -171,7 +154,7 @@
}
static inline tpDphHashNode get_node(struct mac_context *mac, uint8_t assocId,
- dphHashTableClass *pDphHashTable)
+ struct dph_hash_table *pDphHashTable)
{
return &pDphHashTable->pDphNodeArray[assocId];
}
@@ -196,7 +179,7 @@
*/
tpDphHashNode dph_lookup_assoc_id(struct mac_context *mac, uint16_t staIdx,
uint16_t *assocId,
- dphHashTableClass *pDphHashTable)
+ struct dph_hash_table *pDphHashTable)
{
uint8_t i;
@@ -228,7 +211,7 @@
tpDphHashNode dph_init_sta_state(struct mac_context *mac, tSirMacAddr staAddr,
uint16_t assocId, uint8_t validStaIdx,
- dphHashTableClass *pDphHashTable)
+ struct dph_hash_table *pDphHashTable)
{
uint32_t val;
@@ -295,7 +278,7 @@
tpDphHashNode dph_add_hash_entry(struct mac_context *mac, tSirMacAddr staAddr,
uint16_t assocId,
- dphHashTableClass *pDphHashTable)
+ struct dph_hash_table *pDphHashTable)
{
tpDphHashNode ptr, node;
uint16_t index = hash_function(mac, staAddr, pDphHashTable->size);
@@ -368,7 +351,7 @@
QDF_STATUS dph_delete_hash_entry(struct mac_context *mac, tSirMacAddr staAddr,
uint16_t assocId,
- dphHashTableClass *pDphHashTable)
+ struct dph_hash_table *pDphHashTable)
{
tpDphHashNode ptr, prev;
uint16_t index = hash_function(mac, staAddr, pDphHashTable->size);
diff --git a/core/mac/src/dph/dph_hash_table.h b/core/mac/src/dph/dph_hash_table.h
index 51ad162..d01c39c 100644
--- a/core/mac/src/dph/dph_hash_table.h
+++ b/core/mac/src/dph/dph_hash_table.h
@@ -42,48 +42,52 @@
(addr1[4] == addr2[4]) && (addr1[5] == addr2[5]);
}
-/* Hash table class */
-typedef struct {
-
- /* The hash table itself */
+/**
+ * struct dph_hash_table - DPH hash table
+ * @pHashTable: The actual hash table
+ * @pDphNodeArray: The state array
+ * @size: The size of the hash table
+ */
+struct dph_hash_table {
tpDphHashNode *pHashTable;
-
- /* The state array */
tDphHashNode *pDphNodeArray;
uint16_t size;
-} dphHashTableClass;
-
-/* The hash table object */
-extern dphHashTableClass dphHashTable;
+};
tpDphHashNode dph_lookup_hash_entry(struct mac_context *mac, uint8_t staAddr[],
uint16_t *pStaId,
- dphHashTableClass *pDphHashTable);
+ struct dph_hash_table *pDphHashTable);
tpDphHashNode dph_lookup_assoc_id(struct mac_context *mac, uint16_t staIdx,
uint16_t *assocId,
- dphHashTableClass *pDphHashTable);
+ struct dph_hash_table *pDphHashTable);
/* Get a pointer to the hash node */
extern tpDphHashNode dph_get_hash_entry(struct mac_context *mac, uint16_t staId,
- dphHashTableClass *pDphHashTable);
+ struct dph_hash_table *pDphHashTable);
/* Add an entry to the hash table */
extern tpDphHashNode dph_add_hash_entry(struct mac_context *mac,
tSirMacAddr staAddr,
uint16_t staId,
- dphHashTableClass *pDphHashTable);
+ struct dph_hash_table *pDphHashTable);
/* Delete an entry from the hash table */
QDF_STATUS dph_delete_hash_entry(struct mac_context *mac,
tSirMacAddr staAddr, uint16_t staId,
- dphHashTableClass *pDphHashTable);
+ struct dph_hash_table *pDphHashTable);
-void dph_hash_table_class_init(struct mac_context *mac,
- dphHashTableClass *pDphHashTable);
+/**
+ * dph_hash_table_init - Initialize a DPH Hash Table
+ * @mac: Global MAC Context
+ * @pDphHashTable: Pointer to the Hash Table to initialize
+ */
+void dph_hash_table_init(struct mac_context *mac,
+ struct dph_hash_table *pDphHashTable);
+
/* Initialize STA state */
-extern tpDphHashNode dph_init_sta_state(struct mac_context *mac,
- tSirMacAddr staAddr,
- uint16_t staId, uint8_t validStaIdx,
- dphHashTableClass *pDphHashTable);
+tpDphHashNode dph_init_sta_state(struct mac_context *mac,
+ tSirMacAddr staAddr,
+ uint16_t staId, uint8_t validStaIdx,
+ struct dph_hash_table *pDphHashTable);
#endif
diff --git a/core/mac/src/include/dph_global.h b/core/mac/src/include/dph_global.h
index e750b5f..25e42d9 100644
--- a/core/mac/src/include/dph_global.h
+++ b/core/mac/src/include/dph_global.h
@@ -243,7 +243,7 @@
/* ------------------------------------------------------------------- */
typedef struct sAniSirDph {
/* The hash table object */
- dphHashTableClass dphHashTable;
+ struct dph_hash_table dphHashTable;
} tAniSirDph, *tpAniSirDph;
#endif
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index 3804d77..67d3e7b 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -2558,7 +2558,7 @@
(subType == SIR_MAC_MGMT_DISASSOC) &&
(subType == SIR_MAC_MGMT_DEAUTH)) {
uint16_t assoc_id;
- dphHashTableClass *dph_table;
+ struct dph_hash_table *dph_table;
tDphHashNode *sta_ds;
qdf_time_t *timestamp;
diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
index 370c19f..bfa1af5 100644
--- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
+++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
@@ -1346,7 +1346,7 @@
lim_ibss_delete(mac, pe_session);
- dph_hash_table_class_init(mac, &pe_session->dph.dphHashTable);
+ dph_hash_table_init(mac, &pe_session->dph.dphHashTable);
lim_delete_pre_auth_list(mac);
pe_session->limMlmState = eLIM_MLM_IDLE_STATE;
diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
index b4d81f7..e24e558 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
@@ -1830,7 +1830,7 @@
* to occupy the medium during non channel occupancy period. So resume the transmission after
* HAL gives back the response.
*/
- dph_hash_table_class_init(mac, &pe_session->dph.dphHashTable);
+ dph_hash_table_init(mac, &pe_session->dph.dphHashTable);
lim_delete_pre_auth_list(mac);
/* Initialize number of associated stations during cleanup */
pe_session->gLimNumOfCurrentSTAs = 0;
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index 871e773..475a6bb 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -3222,7 +3222,7 @@
(void)body;
SET_LIM_PROCESS_DEFD_MESGS(mac, true);
lim_ibss_delete(mac, pe_session);
- dph_hash_table_class_init(mac, &pe_session->dph.dphHashTable);
+ dph_hash_table_init(mac, &pe_session->dph.dphHashTable);
lim_delete_pre_auth_list(mac);
lim_send_sme_rsp(mac, eWNI_SME_STOP_BSS_RSP, eSIR_SME_SUCCESS,
pe_session->smeSessionId,
diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c
index 9874899..9d83b43 100644
--- a/core/mac/src/pe/lim/lim_session.c
+++ b/core/mac/src/pe/lim/lim_session.c
@@ -592,7 +592,7 @@
session_ptr->dph.dphHashTable.pDphNodeArray =
pe_get_session_dph_node_array(i);
session_ptr->dph.dphHashTable.size = numSta + 1;
- dph_hash_table_class_init(mac, &session_ptr->dph.dphHashTable);
+ dph_hash_table_init(mac, &session_ptr->dph.dphHashTable);
session_ptr->gpLimPeerIdxpool = qdf_mem_malloc(
sizeof(*(session_ptr->gpLimPeerIdxpool)) *
lim_get_peer_idxpool_size(numSta, bssType));
@@ -833,7 +833,7 @@
{
uint8_t i, j;
struct pe_session *session_ptr;
- dphHashTableClass *dph_ptr;
+ struct dph_hash_table *dph_ptr;
for (i = 0; i < mac_ctx->lim.maxBssId; i++) {
if (!mac_ctx->lim.gpSession[i].valid)