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

Merge "qca-wifi: Fix NULL data Tx frame capture"

Browse Source
This commit is contained in:
Linux Build Service Account
2019-12-19 22:32:10 -08:00
committed by Gerrit - the friendly Code Review server
parent b8855c41c6 d8a5ccc005
commit 2e01bacee7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -351,7 +351,7 @@ dp_update_msdu_to_list(struct dp_soc *soc,
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
if (ts->tid > DP_NON_QOS_TID) { if (ts->tid > DP_MAX_TIDS) {
QDF_TRACE(QDF_MODULE_ID_TX_CAPTURE, QDF_TRACE_LEVEL_ERROR, QDF_TRACE(QDF_MODULE_ID_TX_CAPTURE, QDF_TRACE_LEVEL_ERROR,
"%s: %d peer_id %d, tid %d > NON_QOS_TID!", "%s: %d peer_id %d, tid %d > NON_QOS_TID!",
__func__, __LINE__, ts->peer_id, ts->tid); __func__, __LINE__, ts->peer_id, ts->tid);
@@ -728,7 +728,7 @@ QDF_STATUS dp_tx_print_bitmap(struct dp_pdev *pdev,
start_seq = user->start_seq; start_seq = user->start_seq;
num_mpdu = user->mpdu_success; num_mpdu = user->mpdu_success;
if (user->tid > DP_NON_QOS_TID) { if (user->tid > DP_MAX_TIDS) {
QDF_TRACE(QDF_MODULE_ID_TX_CAPTURE, QDF_TRACE_LEVEL_ERROR, QDF_TRACE(QDF_MODULE_ID_TX_CAPTURE, QDF_TRACE_LEVEL_ERROR,
"%s: ppdu[%d] peer_id[%d] TID[%d] > NON_QOS_TID!", "%s: ppdu[%d] peer_id[%d] TID[%d] > NON_QOS_TID!",
__func__, ppdu_id, user->peer_id, user->tid); __func__, ppdu_id, user->peer_id, user->tid);
@@ -1834,7 +1834,9 @@ dp_check_ppdu_and_deliver(struct dp_pdev *pdev,
ppdu_id = ppdu_desc->ppdu_id; ppdu_id = ppdu_desc->ppdu_id;
if (ppdu_desc->frame_type == CDP_PPDU_FTYPE_CTRL) { if (ppdu_desc->frame_type == CDP_PPDU_FTYPE_CTRL ||
ppdu_desc->htt_frame_type ==
HTT_STATS_FTYPE_SGEN_QOS_NULL) {
struct cdp_tx_indication_info tx_capture_info; struct cdp_tx_indication_info tx_capture_info;
struct cdp_tx_indication_mpdu_info *mpdu_info; struct cdp_tx_indication_mpdu_info *mpdu_info;
qdf_nbuf_t mgmt_ctl_nbuf; qdf_nbuf_t mgmt_ctl_nbuf;
@@ -2332,7 +2334,7 @@ void dp_tx_ppdu_stats_process(void *context)
/* print the bit map */ /* print the bit map */
dp_tx_print_bitmap(pdev, ppdu_desc, dp_tx_print_bitmap(pdev, ppdu_desc,
0, ppdu_desc->ppdu_id); 0, ppdu_desc->ppdu_id);
if (ppdu_desc->user[0].tid > DP_NON_QOS_TID) { if (ppdu_desc->user[0].tid > DP_MAX_TIDS) {
QDF_TRACE(QDF_MODULE_ID_TX_CAPTURE, QDF_TRACE(QDF_MODULE_ID_TX_CAPTURE,
QDF_TRACE_LEVEL_ERROR, QDF_TRACE_LEVEL_ERROR,
"%s: ppdu[%d] peer_id[%d] TID[%d] > NON_QOS_TID!", "%s: ppdu[%d] peer_id[%d] TID[%d] > NON_QOS_TID!",

2
dp/wifi3.0/dp_tx_capture.h
View File

@@ -31,7 +31,7 @@ struct dp_tx_desc_s;
#define TX_CAP_HTT_MAX_FTYPE 19 #define TX_CAP_HTT_MAX_FTYPE 19
#define TXCAP_MAX_TYPE \ #define TXCAP_MAX_TYPE \
((IEEE80211_FC0_TYPE_CTL >> IEEE80211_FC0_TYPE_SHIFT) + 1) ((IEEE80211_FC0_TYPE_DATA >> IEEE80211_FC0_TYPE_SHIFT) + 1)
#define TXCAP_MAX_SUBTYPE \ #define TXCAP_MAX_SUBTYPE \
((IEEE80211_FC0_SUBTYPE_MASK >> IEEE80211_FC0_SUBTYPE_SHIFT) + 1) ((IEEE80211_FC0_SUBTYPE_MASK >> IEEE80211_FC0_SUBTYPE_SHIFT) + 1)