ath10k: set a-mpdu receiver reference number

Set the a-mpdu reference number in ath10k to make it accessible in the
receivers radiotap header. Implemented as in ath9k.  The reference number is
needed for troubleshooting and research at the receivers site (e.g. to identify
mpdu's that were aggregated in an a-mpdu)

Signed-off-by: Matthias Frei <mf@frei.media>
[kvalo@qca.qualcomm.com: fix checkpatch warning, commit log cleanup]
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 2b499af722ad2856083b907c350202cdbd4afa69..d74e8980b96e2f4c007c9dff7d11bba67195ca1f 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -993,6 +993,8 @@ struct ath10k {
                u32 reg_ack_cts_timeout_orig;
        } fw_coverage;
 
+       u32 ampdu_reference;
+
        void *ce_priv;
 
        /* must be last */

diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index 398dda978d6e16325681a835fb9e50b7837258b1..799fb7501eb5b02128424c913920191995780ebc 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -890,16 +890,26 @@ static void ath10k_htt_rx_h_ppdu(struct ath10k *ar,
                status->nss = 0;
                status->encoding = RX_ENC_LEGACY;
                status->bw = RATE_INFO_BW_20;
+
                status->flag &= ~RX_FLAG_MACTIME_END;
                status->flag |= RX_FLAG_NO_SIGNAL_VAL;
 
+               status->flag &= ~(RX_FLAG_AMPDU_IS_LAST);
+               status->flag |= RX_FLAG_AMPDU_DETAILS | RX_FLAG_AMPDU_LAST_KNOWN;
+               status->ampdu_reference = ar->ampdu_reference;
+
                ath10k_htt_rx_h_signal(ar, status, rxd);
                ath10k_htt_rx_h_channel(ar, status, rxd, vdev_id);
                ath10k_htt_rx_h_rates(ar, status, rxd);
        }
 
-       if (is_last_ppdu)
+       if (is_last_ppdu) {
                ath10k_htt_rx_h_mactime(ar, status, rxd);
+
+               /* set ampdu last segment flag */
+               status->flag |= RX_FLAG_AMPDU_IS_LAST;
+               ar->ampdu_reference++;
+       }
 }
 
 static const char * const tid_to_ac[] = {