qcacmn: do not store vdev_id in ast_entry
Remove the vdev_id feild from ast_entry structure
Change-Id: I0f79d13399212397c4c88aa5c39d422719a17137
diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c
index 9f8ad32..e6acbf5 100644
--- a/dp/wifi3.0/dp_main.c
+++ b/dp/wifi3.0/dp_main.c
@@ -668,7 +668,7 @@
}
ast_entry_info->type = ast_entry->type;
ast_entry_info->pdev_id = ast_entry->pdev_id;
- ast_entry_info->vdev_id = ast_entry->vdev_id;
+ ast_entry_info->vdev_id = ast_entry->peer->vdev->vdev_id;
ast_entry_info->peer_id = ast_entry->peer->peer_ids[0];
qdf_mem_copy(&ast_entry_info->peer_mac_addr[0],
&ast_entry->peer->mac_addr.raw[0],
@@ -713,7 +713,7 @@
}
ast_entry_info->type = ast_entry->type;
ast_entry_info->pdev_id = ast_entry->pdev_id;
- ast_entry_info->vdev_id = ast_entry->vdev_id;
+ ast_entry_info->vdev_id = ast_entry->peer->vdev->vdev_id;
ast_entry_info->peer_id = ast_entry->peer->peer_ids[0];
qdf_mem_copy(&ast_entry_info->peer_mac_addr[0],
&ast_entry->peer->mac_addr.raw[0],
@@ -1051,8 +1051,7 @@
ase->ast_idx,
ase->ast_hash_value,
ase->delete_in_progress,
- ase->pdev_id,
- ase->vdev_id);
+ ase->pdev_id);
}
}
}
diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c
index 7aeee5e..69fccf6 100644
--- a/dp/wifi3.0/dp_peer.c
+++ b/dp/wifi3.0/dp_peer.c
@@ -761,7 +761,6 @@
qdf_mem_copy(&ast_entry->mac_addr.raw[0], mac_addr, QDF_MAC_ADDR_SIZE);
ast_entry->pdev_id = vdev->pdev->pdev_id;
- ast_entry->vdev_id = vdev->vdev_id;
ast_entry->is_mapped = false;
ast_entry->delete_in_progress = false;
@@ -941,7 +940,7 @@
*/
if (qdf_unlikely(ast_entry->peer == peer) &&
(ast_entry->type == CDP_TXRX_AST_TYPE_WDS) &&
- (ast_entry->vdev_id == peer->vdev->vdev_id) &&
+ (ast_entry->peer->vdev == peer->vdev) &&
(ast_entry->is_active))
return 0;
@@ -951,7 +950,6 @@
ast_entry->peer = peer;
ast_entry->type = CDP_TXRX_AST_TYPE_WDS;
ast_entry->pdev_id = peer->vdev->pdev->pdev_id;
- ast_entry->vdev_id = peer->vdev->vdev_id;
ast_entry->is_active = TRUE;
TAILQ_INSERT_TAIL(&peer->ast_entry_list, ast_entry, ase_list_elem);
diff --git a/dp/wifi3.0/dp_types.h b/dp/wifi3.0/dp_types.h
index b0c7aab..30c919c 100644
--- a/dp/wifi3.0/dp_types.h
+++ b/dp/wifi3.0/dp_types.h
@@ -813,7 +813,6 @@
bool is_active;
bool is_mapped;
uint8_t pdev_id;
- uint8_t vdev_id;
uint16_t ast_hash_value;
qdf_atomic_t ref_cnt;
enum cdp_txrx_ast_entry_type type;