A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacld-3.0: Correct fw common references in dp layer" into wlan-cld3.driver.lnx.1.1-dev

Browse source
This commit is contained in:
Service qcabuildsw 2016-07-13 11:12:10 -07:00 • committed by Gerrit - the friendly Code Review server
commit 2ea922dbc9
4 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
core/dp/htt/htt_fw_stats.c
View file

@ -855,11 +855,11 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr,
/* fields used for both concise and complete printouts */
start_seq_num =
((*(msg_word + OL_FW_TX_DBG_PPDU_START_SEQ_NUM_16)) &
((*(msg_word + OL_FW_TX_DBG_PPDU_START_SEQ_NUM_WORD)) &
OL_FW_TX_DBG_PPDU_START_SEQ_NUM_M) >>
OL_FW_TX_DBG_PPDU_START_SEQ_NUM_S;
complete =
((*(msg_word + OL_FW_TX_DBG_PPDU_COMPLETE_16)) &
((*(msg_word + OL_FW_TX_DBG_PPDU_COMPLETE_WORD)) &
OL_FW_TX_DBG_PPDU_COMPLETE_M) >>
OL_FW_TX_DBG_PPDU_COMPLETE_S;
@ -878,31 +878,31 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr,
start_pn_lsbs =
((*
(msg_word +
OL_FW_TX_DBG_PPDU_START_PN_LSBS_16)) &
OL_FW_TX_DBG_PPDU_START_PN_LSBS_WORD)) &
OL_FW_TX_DBG_PPDU_START_PN_LSBS_M) >>
OL_FW_TX_DBG_PPDU_START_PN_LSBS_S;
num_mpdus =
((*(msg_word + OL_FW_TX_DBG_PPDU_NUM_MPDUS_16))&
((*(msg_word + OL_FW_TX_DBG_PPDU_NUM_MPDUS_WORD))&
OL_FW_TX_DBG_PPDU_NUM_MPDUS_M) >>
OL_FW_TX_DBG_PPDU_NUM_MPDUS_S;
peer_id =
((*(msg_word + OL_FW_TX_DBG_PPDU_PEER_ID_16)) &
((*(msg_word + OL_FW_TX_DBG_PPDU_PEER_ID_WORD)) &
OL_FW_TX_DBG_PPDU_PEER_ID_M) >>
OL_FW_TX_DBG_PPDU_PEER_ID_S;
ext_tid =
((*(msg_word + OL_FW_TX_DBG_PPDU_EXT_TID_16)) &
((*(msg_word + OL_FW_TX_DBG_PPDU_EXT_TID_WORD)) &
OL_FW_TX_DBG_PPDU_EXT_TID_M) >>
OL_FW_TX_DBG_PPDU_EXT_TID_S;
rate_code =
((*(msg_word + OL_FW_TX_DBG_PPDU_RATE_CODE_16))&
((*(msg_word + OL_FW_TX_DBG_PPDU_RATE_CODE_WORD))&
OL_FW_TX_DBG_PPDU_RATE_CODE_M) >>
OL_FW_TX_DBG_PPDU_RATE_CODE_S;
rate_flags =
((*(msg_word + OL_FW_TX_DBG_PPDU_RATEFLAGS_16))&
((*(msg_word + OL_FW_TX_DBG_PPDU_RATE_FLAGS_WORD))&
OL_FW_TX_DBG_PPDU_RATE_FLAGS_M) >>
OL_FW_TX_DBG_PPDU_RATE_FLAGS_S;
tries =
((*(msg_word + OL_FW_TX_DBG_PPDU_TRIES_16)) &
((*(msg_word + OL_FW_TX_DBG_PPDU_TRIES_WORD)) &
OL_FW_TX_DBG_PPDU_TRIES_M) >>
OL_FW_TX_DBG_PPDU_TRIES_S;
@ -929,9 +929,9 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr,
qdf_print
(" enqueued and acked MPDU bitmaps:");
htt_t2h_tx_ppdu_bitmaps_pr(msg_word +
OL_FW_TX_DBG_PPDU_ENQUEUED_LSBS_16,
OL_FW_TX_DBG_PPDU_ENQUEUED_LSBS_WORD,
msg_word +
OL_FW_TX_DBG_PPDU_BLOCK_ACK_LSBS_16);
OL_FW_TX_DBG_PPDU_BLOCK_ACK_LSBS_WORD);
} else {
qdf_print
(" enqueued: %d us, not yet completed",
@ -968,9 +968,9 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr,
qdf_print("enqueued and acked MPDU bitmaps:");
if (complete) {
htt_t2h_tx_ppdu_bitmaps_pr(msg_word +
OL_FW_TX_DBG_PPDU_ENQUEUED_LSBS_16,
OL_FW_TX_DBG_PPDU_ENQUEUED_LSBS_WORD,
msg_word +
OL_FW_TX_DBG_PPDU_BLOCK_ACK_LSBS_16);
OL_FW_TX_DBG_PPDU_BLOCK_ACK_LSBS_WORD);
} else {
qdf_print("(not completed)");
}

2
core/dp/htt/htt_rx.c
View file

@ -2029,7 +2029,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev,
msdu_count--;
if (qdf_unlikely((*((u_int8_t *) &rx_desc->fw_desc.u.val)) &
FW_RX_DESC_MIC_ERR_M)) {
FW_RX_DESC_ANY_ERR_M)) {
uint8_t tid =
HTT_RX_IN_ORD_PADDR_IND_EXT_TID_GET(
*(u_int32_t *)rx_ind_data);

1
core/dp/txrx/ol_txrx.c
View file

@ -80,6 +80,7 @@
#endif
#include <cds_concurrency.h>
#include "epping_main.h"
#include <a_types.h>
#ifdef CONFIG_HL_SUPPORT

1
core/wma/inc/wma.h
View file

@ -49,6 +49,7 @@
#include "wmi_unified_api.h"
#include "cdp_txrx_cmn.h"
#include "ol_defines.h"
#include "dbglog.h"
/* Platform specific configuration for max. no. of fragments */
#define QCA_OL_11AC_TX_MAX_FRAGS 2