From 800b18c6408a2e03ca97ee8587b98b21d98d9e8a Mon Sep 17 00:00:00 2001 From: Nandha Kishore Easwaran Date: Thu, 25 Oct 2018 18:34:56 +0530 Subject: [PATCH] qcacmn: Revert Retrieve MAC address from nbuf for MEC EVENT This reverts change Iab8dc346b9a2108e4cb107fb61d242700a084223 Change-Id: I63826f31a7fc65518d19c8bce699e4ca789451c1 --- dp/wifi3.0/dp_tx.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dp/wifi3.0/dp_tx.c b/dp/wifi3.0/dp_tx.c index ebbd0553e5d1..89e4b81802a7 100644 --- a/dp/wifi3.0/dp_tx.c +++ b/dp/wifi3.0/dp_tx.c @@ -2477,6 +2477,7 @@ void dp_tx_mec_handler(struct dp_vdev *vdev, uint8_t *status) struct dp_soc *soc; uint32_t flags = IEEE80211_NODE_F_WDS_HM; struct dp_peer *peer; + uint8_t mac_addr[DP_MAC_ADDR_LEN], i; if (!vdev->wds_enabled) return; @@ -2500,13 +2501,14 @@ void dp_tx_mec_handler(struct dp_vdev *vdev, uint8_t *status) "%s Tx MEC Handler", __func__); - /* note: mac address is in (status + sizeof(uint32_t)) */ - if (qdf_mem_cmp((status + sizeof(uint32_t)), - vdev->mac_addr.raw, - DP_MAC_ADDR_LEN)) + for (i = 0; i < DP_MAC_ADDR_LEN; i++) + mac_addr[(DP_MAC_ADDR_LEN - 1) - i] = + status[(DP_MAC_ADDR_LEN - 2) + i]; + + if (qdf_mem_cmp(mac_addr, vdev->mac_addr.raw, DP_MAC_ADDR_LEN)) dp_peer_add_ast(soc, peer, - (status + sizeof(uint32_t)), + mac_addr, CDP_TXRX_AST_TYPE_MEC, flags); } @@ -2990,14 +2992,12 @@ void dp_tx_process_htt_completion(struct dp_tx_desc_s *tx_desc, uint8_t *status) struct hal_tx_completion_status ts = {0}; uint32_t *htt_desc = (uint32_t *)status; struct dp_peer *peer; - qdf_nbuf_t nbuf; qdf_assert(tx_desc->pdev); pdev = tx_desc->pdev; vdev = tx_desc->vdev; soc = pdev->soc; - nbuf = tx_desc->nbuf; tx_status = HTT_TX_WBM_COMPLETION_V2_TX_STATUS_GET(htt_desc[0]); @@ -3049,9 +3049,6 @@ void dp_tx_process_htt_completion(struct dp_tx_desc_s *tx_desc, uint8_t *status) } case HTT_TX_FW2WBM_TX_STATUS_MEC_NOTIFY: { - qdf_mem_copy(((uint8_t *)&htt_desc[1]), - &nbuf->data[DP_MAC_ADDR_LEN], - DP_MAC_ADDR_LEN); dp_tx_mec_handler(vdev, status); break; }