|
@@ -666,9 +666,7 @@ dp_rx_mon_handle_full_mon(struct dp_pdev *pdev,
|
|
|
uint8_t num_frags, frag_iter, l2_hdr_offset;
|
|
|
struct ieee80211_frame *wh;
|
|
|
struct ieee80211_qoscntl *qos;
|
|
|
- void *hdr_frag_addr;
|
|
|
- uint32_t hdr_frag_size, frag_page_offset, pad_byte_pholder,
|
|
|
- msdu_len;
|
|
|
+ uint32_t hdr_frag_size, frag_page_offset, pad_byte_pholder;
|
|
|
qdf_nbuf_t head_msdu, msdu_cur;
|
|
|
void *frag_addr;
|
|
|
bool prev_msdu_end_received = false;
|
|
@@ -765,7 +763,6 @@ dp_rx_mon_handle_full_mon(struct dp_pdev *pdev,
|
|
|
QDF_NBUF_CB_RX_CTX_ID(mpdu) = 0;
|
|
|
|
|
|
/* Construct destination address */
|
|
|
- hdr_frag_addr = qdf_nbuf_get_frag_addr(mpdu, 0);
|
|
|
hdr_frag_size = qdf_nbuf_get_frag_size_by_idx(mpdu, 0);
|
|
|
|
|
|
/* Adjust page frag offset to point to 802.11 header */
|
|
@@ -774,7 +771,6 @@ dp_rx_mon_handle_full_mon(struct dp_pdev *pdev,
|
|
|
|
|
|
msdu_meta = (struct hal_rx_mon_msdu_info *)(((void *)qdf_nbuf_get_frag_addr(mpdu, 1)) - (DP_RX_MON_PACKET_OFFSET + DP_RX_MON_NONRAW_L2_HDR_PAD_BYTE));
|
|
|
|
|
|
- msdu_len = msdu_meta->msdu_len;
|
|
|
|
|
|
/* Adjust page frag offset to appropriate after decap header */
|
|
|
frag_page_offset =
|
|
@@ -1802,7 +1798,6 @@ dp_rx_mon_srng_process_2_0(struct dp_soc *soc, struct dp_intr *int_ctx,
|
|
|
uint32_t work_done = 0;
|
|
|
struct hal_rx_ppdu_info *ppdu_info = NULL;
|
|
|
QDF_STATUS status;
|
|
|
-
|
|
|
if (!pdev) {
|
|
|
dp_mon_err("%pK: pdev is null for mac_id = %d", soc, mac_id);
|
|
|
return work_done;
|
|
@@ -1894,9 +1889,9 @@ dp_rx_mon_srng_process_2_0(struct dp_soc *soc, struct dp_intr *int_ctx,
|
|
|
|
|
|
rx_mon_dst_ring_desc = hal_srng_dst_get_next(hal_soc, mon_dst_srng);
|
|
|
|
|
|
- status = dp_rx_process_pktlog_be(soc, pdev, ppdu_info,
|
|
|
- mon_desc->buf_addr,
|
|
|
- hal_mon_rx_desc.end_offset);
|
|
|
+ dp_rx_process_pktlog_be(soc, pdev, ppdu_info,
|
|
|
+ mon_desc->buf_addr,
|
|
|
+ hal_mon_rx_desc.end_offset);
|
|
|
|
|
|
if (hal_mon_rx_desc.end_reason == HAL_MON_STATUS_BUFFER_FULL)
|
|
|
continue;
|
|
@@ -1993,7 +1988,6 @@ void dp_rx_mon_buf_desc_pool_free(struct dp_soc *soc)
|
|
|
QDF_STATUS
|
|
|
dp_rx_mon_buf_desc_pool_alloc(struct dp_soc *soc)
|
|
|
{
|
|
|
- struct dp_srng *mon_buf_ring;
|
|
|
struct dp_mon_desc_pool *rx_mon_desc_pool;
|
|
|
struct dp_mon_soc *mon_soc = soc->monitor_soc;
|
|
|
struct dp_mon_soc_be *mon_soc_be = dp_get_be_mon_soc_from_dp_mon_soc(mon_soc);
|
|
@@ -2003,7 +1997,6 @@ dp_rx_mon_buf_desc_pool_alloc(struct dp_soc *soc)
|
|
|
soc_cfg_ctx = soc->wlan_cfg_ctx;
|
|
|
|
|
|
entries = wlan_cfg_get_dp_soc_rx_mon_buf_ring_size(soc_cfg_ctx);
|
|
|
- mon_buf_ring = &soc->rxdma_mon_buf_ring[0];
|
|
|
|
|
|
rx_mon_desc_pool = &mon_soc_be->rx_desc_mon;
|
|
|
|