summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGovind Singh <govinds@qti.qualcomm.com>2016-07-14 18:53:17 +0530
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2016-07-21 13:21:54 +0530
commit20c0bd95a6a065a60ec6ec6be5a9abb7ba0c5378 (patch)
tree6881832ff8a342594dfbcb17864282e323bff3a5
parent45f4b3e8576847f4dafe25c14ed09156d172e028 (diff)
qcacld-2.0: Remove peer id check for per msdu count
In rx data path, aggregated msdu are coming for single peer id. Hence, it is unnecessary to validate peer id per msdu count. This is resulting in excessive logging. Remove peer id check for per msdu count to avoid excessive logging in case of wrong peer id passed from the target. Change-Id: I57af2f5b067fa4e76f42379afa40a0f547221fac CRs-Fixed: 1041359
-rw-r--r--CORE/CLD_TXRX/HTT/htt_rx.c8
-rw-r--r--CORE/CLD_TXRX/TXRX/ol_rx.c10
-rw-r--r--CORE/SERVICES/COMMON/ol_htt_api.h4
3 files changed, 11 insertions, 11 deletions
diff --git a/CORE/CLD_TXRX/HTT/htt_rx.c b/CORE/CLD_TXRX/HTT/htt_rx.c
index c22edc615ce4..3e4708ebd917 100644
--- a/CORE/CLD_TXRX/HTT/htt_rx.c
+++ b/CORE/CLD_TXRX/HTT/htt_rx.c
@@ -48,6 +48,7 @@
#include <ol_cfg.h>
#include <ol_rx.h>
#include <ol_htt_rx_api.h>
+#include <ol_txrx_peer_find.h>
#include <htt_internal.h> /* HTT_ASSERT, htt_pdev_t, HTT_RX_BUF_SIZE */
#include "regtable.h"
#include "adf_trace.h"
@@ -1857,6 +1858,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(
struct htt_host_rx_desc_base *rx_desc;
enum rx_pkt_fate status = RX_PKT_FATE_SUCCESS;
uint16_t peer_id;
+ struct ol_txrx_peer_t *peer;
HTT_ASSERT1(htt_rx_in_order_ring_elems(pdev) != 0);
@@ -1870,6 +1872,10 @@ htt_rx_amsdu_rx_in_order_pop_ll(
HTT_RX_CHECK_MSDU_COUNT(msdu_count);
peer_id = HTT_RX_IN_ORD_PADDR_IND_PEER_ID_GET(
*(u_int32_t *)rx_ind_data);
+ peer = ol_txrx_peer_find_by_id(pdev->txrx_pdev, peer_id);
+ if (!peer)
+ adf_os_print("%s: invalid peer id %d and msdu count %d\n", __func__,
+ peer_id, msdu_count);
msg_word = (u_int32_t *)(rx_ind_data + HTT_RX_IN_ORD_PADDR_IND_HDR_BYTES);
if (offload_ind) {
@@ -1934,7 +1940,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(
FW_RX_DESC_MIC_ERR_M))
status = RX_PKT_FATE_FW_DROP_INVALID;
if (pdev->rx_pkt_dump_cb)
- pdev->rx_pkt_dump_cb(msdu, peer_id, status);
+ pdev->rx_pkt_dump_cb(msdu, peer, status);
if (adf_os_unlikely((*((u_int8_t *) &rx_desc->fw_desc.u.val)) &
FW_RX_DESC_MIC_ERR_M)) {
diff --git a/CORE/CLD_TXRX/TXRX/ol_rx.c b/CORE/CLD_TXRX/TXRX/ol_rx.c
index 0c452fd55805..87a680af2189 100644
--- a/CORE/CLD_TXRX/TXRX/ol_rx.c
+++ b/CORE/CLD_TXRX/TXRX/ol_rx.c
@@ -1268,12 +1268,11 @@ ol_rx_in_order_indication_handler(
*/
void ol_rx_pkt_dump_call(
adf_nbuf_t msdu,
- uint16_t peer_id,
+ struct ol_txrx_peer_t *peer,
uint8_t status)
{
v_CONTEXT_t vos_context;
ol_txrx_pdev_handle pdev;
- struct ol_txrx_peer_t *peer = NULL;
vos_context = vos_get_global_context(VOS_MODULE_ID_TXRX, NULL);
pdev = vos_get_context(VOS_MODULE_ID_TXRX, vos_context);
@@ -1285,13 +1284,8 @@ void ol_rx_pkt_dump_call(
}
if (pdev->ol_rx_packetdump_cb) {
- peer = ol_txrx_peer_find_by_id(pdev, peer_id);
- if (!peer) {
- TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
- "%s: peer with peer id %d is NULL", __func__,
- peer_id);
+ if (!peer)
return;
- }
pdev->ol_rx_packetdump_cb(msdu, status, peer->vdev->vdev_id,
RX_DATA_PKT);
}
diff --git a/CORE/SERVICES/COMMON/ol_htt_api.h b/CORE/SERVICES/COMMON/ol_htt_api.h
index 068624c77f22..222db3d0462a 100644
--- a/CORE/SERVICES/COMMON/ol_htt_api.h
+++ b/CORE/SERVICES/COMMON/ol_htt_api.h
@@ -326,12 +326,12 @@ htt_clear_bundle_stats(struct htt_pdev_t *pdev);
#endif
-typedef void (*tp_rx_pkt_dump_cb)(adf_nbuf_t msdu, uint16_t peer_id,
+typedef void (*tp_rx_pkt_dump_cb)(adf_nbuf_t msdu, struct ol_txrx_peer_t *peer,
uint8_t status);
void htt_register_rx_pkt_dump_callback(struct htt_pdev_t *pdev,
tp_rx_pkt_dump_cb ol_rx_pkt_dump_call);
void htt_deregister_rx_pkt_dump_callback(struct htt_pdev_t *pdev);
-void ol_rx_pkt_dump_call(adf_nbuf_t msdu, uint16_t peer_id, uint8_t status);
+void ol_rx_pkt_dump_call(adf_nbuf_t msdu, struct ol_txrx_peer_t *peer, uint8_t status);
void htt_mark_first_wakeup_packet(htt_pdev_handle pdev, uint8_t value);
#endif /* _OL_HTT_API__H_ */