ath10k: introduce ieee80211_rx_status to htt_rx_info

Will be used as a template, and final storage for
rx_status.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h
index 654867fc1ae73bbd7a13cf4dc61f8ac89a0b7823..e80f0330fd282bf3557c39059dcfca8d31de0e4f 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt.h
+++ b/drivers/net/wireless/ath/ath10k/htt.h
@@ -21,6 +21,7 @@
 #include <linux/bug.h>
 #include <linux/interrupt.h>
 #include <linux/dmapool.h>
+#include <net/mac80211.h>
 
 #include "htc.h"
 #include "rx_desc.h"
@@ -1174,6 +1175,7 @@ struct htt_peer_unmap_event {
 
 struct htt_rx_info {
        struct sk_buff *skb;
+       struct ieee80211_rx_status rx_status;
        enum htt_rx_mpdu_status status;
        enum htt_rx_mpdu_encrypt_type encrypt_type;
        s8 signal;

diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index fd14c3a1e1493ba3c26601c152f1d2af5c911e05..f18e41cd273676e27736aeecd040e61a2ea14175 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -756,7 +756,7 @@ static void ath10k_process_rx(struct ath10k *ar, struct htt_rx_info *info)
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)info->skb->data;
 
        status = IEEE80211_SKB_RXCB(info->skb);
-       memset(status, 0, sizeof(*status));
+       memcpy(status, &info->rx_status, sizeof(*status));
 
        if (info->encrypt_type != HTT_RX_MPDU_ENCRYPT_NONE) {
                status->flag |= RX_FLAG_DECRYPTED | RX_FLAG_IV_STRIPPED |