Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for v5.14. Major changes: ath9k * provide STBC info in the received frames
This commit is contained in:
commit
1e36f828c4
@ -301,7 +301,7 @@ struct ath10k_fw_stats_pdev {
|
||||
s32 underrun;
|
||||
u32 hw_paused;
|
||||
s32 tx_abort;
|
||||
s32 mpdus_requed;
|
||||
s32 mpdus_requeued;
|
||||
u32 tx_ko;
|
||||
u32 data_rc;
|
||||
u32 self_triggers;
|
||||
|
@ -1105,7 +1105,7 @@ static const char ath10k_gstrings_stats[][ETH_GSTRING_LEN] = {
|
||||
"d_tx_ppdu_reaped",
|
||||
"d_tx_fifo_underrun",
|
||||
"d_tx_ppdu_abort",
|
||||
"d_tx_mpdu_requed",
|
||||
"d_tx_mpdu_requeued",
|
||||
"d_tx_excessive_retries",
|
||||
"d_tx_hw_rate",
|
||||
"d_tx_dropped_sw_retries",
|
||||
@ -1205,7 +1205,7 @@ void ath10k_debug_get_et_stats(struct ieee80211_hw *hw,
|
||||
data[i++] = pdev_stats->hw_reaped;
|
||||
data[i++] = pdev_stats->underrun;
|
||||
data[i++] = pdev_stats->tx_abort;
|
||||
data[i++] = pdev_stats->mpdus_requed;
|
||||
data[i++] = pdev_stats->mpdus_requeued;
|
||||
data[i++] = pdev_stats->tx_ko;
|
||||
data[i++] = pdev_stats->data_rc;
|
||||
data[i++] = pdev_stats->sw_retry_failure;
|
||||
|
@ -1283,8 +1283,8 @@ struct htt_dbg_stats_wal_tx_stats {
|
||||
/* Num PPDUs cleaned up in TX abort */
|
||||
__le32 tx_abort;
|
||||
|
||||
/* Num MPDUs requed by SW */
|
||||
__le32 mpdus_requed;
|
||||
/* Num MPDUs requeued by SW */
|
||||
__le32 mpdus_requeued;
|
||||
|
||||
/* excessive retries */
|
||||
__le32 tx_ko;
|
||||
|
@ -2867,7 +2867,7 @@ void ath10k_wmi_pull_pdev_stats_tx(const struct wmi_pdev_stats_tx *src,
|
||||
dst->hw_reaped = __le32_to_cpu(src->hw_reaped);
|
||||
dst->underrun = __le32_to_cpu(src->underrun);
|
||||
dst->tx_abort = __le32_to_cpu(src->tx_abort);
|
||||
dst->mpdus_requed = __le32_to_cpu(src->mpdus_requed);
|
||||
dst->mpdus_requeued = __le32_to_cpu(src->mpdus_requeued);
|
||||
dst->tx_ko = __le32_to_cpu(src->tx_ko);
|
||||
dst->data_rc = __le32_to_cpu(src->data_rc);
|
||||
dst->self_triggers = __le32_to_cpu(src->self_triggers);
|
||||
@ -2895,7 +2895,7 @@ ath10k_wmi_10_4_pull_pdev_stats_tx(const struct wmi_10_4_pdev_stats_tx *src,
|
||||
dst->hw_reaped = __le32_to_cpu(src->hw_reaped);
|
||||
dst->underrun = __le32_to_cpu(src->underrun);
|
||||
dst->tx_abort = __le32_to_cpu(src->tx_abort);
|
||||
dst->mpdus_requed = __le32_to_cpu(src->mpdus_requed);
|
||||
dst->mpdus_requeued = __le32_to_cpu(src->mpdus_requeued);
|
||||
dst->tx_ko = __le32_to_cpu(src->tx_ko);
|
||||
dst->data_rc = __le32_to_cpu(src->data_rc);
|
||||
dst->self_triggers = __le32_to_cpu(src->self_triggers);
|
||||
@ -8270,7 +8270,7 @@ ath10k_wmi_fw_pdev_tx_stats_fill(const struct ath10k_fw_stats_pdev *pdev,
|
||||
len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",
|
||||
"PPDUs cleaned", pdev->tx_abort);
|
||||
len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",
|
||||
"MPDUs requed", pdev->mpdus_requed);
|
||||
"MPDUs requeued", pdev->mpdus_requeued);
|
||||
len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",
|
||||
"Excessive retries", pdev->tx_ko);
|
||||
len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",
|
||||
|
@ -4371,8 +4371,8 @@ struct wmi_pdev_stats_tx {
|
||||
/* Num PPDUs cleaned up in TX abort */
|
||||
__le32 tx_abort;
|
||||
|
||||
/* Num MPDUs requed by SW */
|
||||
__le32 mpdus_requed;
|
||||
/* Num MPDUs requeued by SW */
|
||||
__le32 mpdus_requeued;
|
||||
|
||||
/* excessive retries */
|
||||
__le32 tx_ko;
|
||||
@ -4444,8 +4444,8 @@ struct wmi_10_4_pdev_stats_tx {
|
||||
/* Num PPDUs cleaned up in TX abort */
|
||||
__le32 tx_abort;
|
||||
|
||||
/* Num MPDUs requed by SW */
|
||||
__le32 mpdus_requed;
|
||||
/* Num MPDUs requeued by SW */
|
||||
__le32 mpdus_requeued;
|
||||
|
||||
/* excessive retries */
|
||||
__le32 tx_ko;
|
||||
|
@ -795,8 +795,8 @@ struct ath11k_fw_stats_pdev {
|
||||
s32 underrun;
|
||||
/* Num PPDUs cleaned up in TX abort */
|
||||
s32 tx_abort;
|
||||
/* Num MPDUs requed by SW */
|
||||
s32 mpdus_requed;
|
||||
/* Num MPDUs requeued by SW */
|
||||
s32 mpdus_requeued;
|
||||
/* excessive retries */
|
||||
u32 tx_ko;
|
||||
/* data hw rate code */
|
||||
|
@ -89,7 +89,7 @@ static inline void htt_print_tx_pdev_stats_cmn_tlv(const void *tag_buf,
|
||||
len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_abort = %u",
|
||||
htt_stats_buf->tx_abort);
|
||||
len += HTT_DBG_OUT(buf + len, buf_len - len, "mpdu_requeued = %u",
|
||||
htt_stats_buf->mpdu_requed);
|
||||
htt_stats_buf->mpdu_requeued);
|
||||
len += HTT_DBG_OUT(buf + len, buf_len - len, "tx_xretry = %u",
|
||||
htt_stats_buf->tx_xretry);
|
||||
len += HTT_DBG_OUT(buf + len, buf_len - len, "data_rc = %u",
|
||||
|
@ -147,7 +147,7 @@ struct htt_tx_pdev_stats_cmn_tlv {
|
||||
u32 hw_flush;
|
||||
u32 hw_filt;
|
||||
u32 tx_abort;
|
||||
u32 mpdu_requed;
|
||||
u32 mpdu_requeued;
|
||||
u32 tx_xretry;
|
||||
u32 data_rc;
|
||||
u32 mpdu_dropped_xretry;
|
||||
|
@ -5235,7 +5235,7 @@ ath11k_wmi_pull_pdev_stats_tx(const struct wmi_pdev_stats_tx *src,
|
||||
dst->hw_reaped = src->hw_reaped;
|
||||
dst->underrun = src->underrun;
|
||||
dst->tx_abort = src->tx_abort;
|
||||
dst->mpdus_requed = src->mpdus_requed;
|
||||
dst->mpdus_requeued = src->mpdus_requeued;
|
||||
dst->tx_ko = src->tx_ko;
|
||||
dst->data_rc = src->data_rc;
|
||||
dst->self_triggers = src->self_triggers;
|
||||
@ -5505,7 +5505,7 @@ ath11k_wmi_fw_pdev_tx_stats_fill(const struct ath11k_fw_stats_pdev *pdev,
|
||||
len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",
|
||||
"PPDUs cleaned", pdev->tx_abort);
|
||||
len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",
|
||||
"MPDUs requed", pdev->mpdus_requed);
|
||||
"MPDUs requeued", pdev->mpdus_requeued);
|
||||
len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",
|
||||
"Excessive retries", pdev->tx_ko);
|
||||
len += scnprintf(buf + len, buf_len - len, "%30s %10u\n",
|
||||
|
@ -4171,8 +4171,8 @@ struct wmi_pdev_stats_tx {
|
||||
/* Num PPDUs cleaned up in TX abort */
|
||||
s32 tx_abort;
|
||||
|
||||
/* Num MPDUs requed by SW */
|
||||
s32 mpdus_requed;
|
||||
/* Num MPDUs requeued by SW */
|
||||
s32 mpdus_requeued;
|
||||
|
||||
/* excessive retries */
|
||||
u32 tx_ko;
|
||||
|
@ -522,6 +522,8 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs,
|
||||
rxs->rs_moreaggr = (rxsp->status11 & AR_RxMoreAggr) ? 1 : 0;
|
||||
rxs->rs_antenna = (MS(rxsp->status4, AR_RxAntenna) & 0x7);
|
||||
rxs->enc_flags |= (rxsp->status4 & AR_GI) ? RX_ENC_FLAG_SHORT_GI : 0;
|
||||
rxs->enc_flags |=
|
||||
(rxsp->status4 & AR_STBC) ? (1 << RX_ENC_FLAG_STBC_SHIFT) : 0;
|
||||
rxs->bw = (rxsp->status4 & AR_2040) ? RATE_INFO_BW_40 : RATE_INFO_BW_20;
|
||||
|
||||
rxs->evm0 = rxsp->status6;
|
||||
|
Loading…
x
Reference in New Issue
Block a user