samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "qca-wifi: Rectify nbuf copy expand in TX Capture feature"

Browse Source
This commit is contained in:
Linux Build Service Account
2020-02-21 11:44:22 -08:00
committed by Gerrit - the friendly Code Review server
parent ca1e6f5577 2a21448971
commit a633871412
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dp/wifi3.0/dp_tx_capture.c
View File

@@ -2125,13 +2125,16 @@ dp_tx_mon_proc_pending_ppdus(struct dp_pdev *pdev, struct dp_tx_tid *tx_tid,
/* Find missing mpdus from current schedule list */ /* Find missing mpdus from current schedule list */
ppdu_cnt = 0; ppdu_cnt = 0;
if (!nbuf_ppdu_desc_list[ppdu_cnt]) { while (!nbuf_ppdu_desc_list[ppdu_cnt]) {
ppdu_cnt++; ppdu_cnt++;
if (ppdu_cnt < ppdu_desc_cnt) if (ppdu_cnt < ppdu_desc_cnt)
continue; continue;
break; break;
} }
if (ppdu_cnt == ppdu_desc_cnt)
break;
ppdu_desc = (struct cdp_tx_completion_ppdu *)qdf_nbuf_data( ppdu_desc = (struct cdp_tx_completion_ppdu *)qdf_nbuf_data(
pend_ppdu); pend_ppdu);
@@ -2577,8 +2580,8 @@ insert_mgmt_buf_to_queue:
(struct cdp_tx_completion_ppdu *) (struct cdp_tx_completion_ppdu *)
qdf_nbuf_data(nbuf_retry_ppdu); qdf_nbuf_data(nbuf_retry_ppdu);
tmp_mgmt_ctl_nbuf = tmp_mgmt_ctl_nbuf =
skb_copy_expand(mgmt_ctl_nbuf, qdf_nbuf_copy_expand(mgmt_ctl_nbuf,
0, 0, GFP_ATOMIC); 0, 0);
dp_update_tx_cap_info(pdev, nbuf_retry_ppdu, dp_update_tx_cap_info(pdev, nbuf_retry_ppdu,
&tx_capture_info, true); &tx_capture_info, true);
@@ -2801,7 +2804,6 @@ dp_check_ppdu_and_deliver(struct dp_pdev *pdev,
uint32_t num_mpdu; uint32_t num_mpdu;
uint16_t start_seq, seq_no = 0; uint16_t start_seq, seq_no = 0;
int i; int i;
uint32_t len;
qdf_nbuf_t mpdu_nbuf; qdf_nbuf_t mpdu_nbuf;
struct dp_peer *peer; struct dp_peer *peer;
uint8_t type; uint8_t type;
@@ -2858,9 +2860,6 @@ dp_check_ppdu_and_deliver(struct dp_pdev *pdev,
num_mpdu = ppdu_desc->user[0].mpdu_success; num_mpdu = ppdu_desc->user[0].mpdu_success;
/* get length */
len = qdf_nbuf_queue_len(&ppdu_desc->mpdu_q);
/* ba_size is updated in BA bitmap TLVs, which are not received /* ba_size is updated in BA bitmap TLVs, which are not received
* in case of non-QoS TID. * in case of non-QoS TID.
*/ */