Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[linux-2.6-microblaze.git] / drivers / net / wireless / ath / ath11k / hal_rx.h

diff --git a/drivers/net/wireless/ath/ath11k/hal_rx.h b/drivers/net/wireless/ath/ath11k/hal_rx.h
index bb022c7..e863e4a 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/hal_rx.h
+++ b/drivers/net/wireless/ath/ath11k/hal_rx.h
@@ -99,6 +99,8 @@ struct hal_rx_mon_ppdu_info {
        u8 beamformed;
        u8 rssi_comb;
        u8 tid;
+       u8 dcm;
+       u8 ru_alloc;
        u8 reception_type;
        u64 rx_duration;
 };
@@ -325,6 +327,34 @@ enum hal_rx_mon_status
 ath11k_hal_rx_parse_mon_status(struct ath11k_base *ab,
                               struct hal_rx_mon_ppdu_info *ppdu_info,
                               struct sk_buff *skb);
+
+static inline u32 ath11k_he_ru_tones_to_nl80211_he_ru_alloc(u16 ru_tones)
+{
+       u32 ret = 0;
+
+       switch (ru_tones) {
+       case RU_26:
+               ret = NL80211_RATE_INFO_HE_RU_ALLOC_26;
+               break;
+       case RU_52:
+               ret = NL80211_RATE_INFO_HE_RU_ALLOC_52;
+               break;
+       case RU_106:
+               ret = NL80211_RATE_INFO_HE_RU_ALLOC_106;
+               break;
+       case RU_242:
+               ret = NL80211_RATE_INFO_HE_RU_ALLOC_242;
+               break;
+       case RU_484:
+               ret = NL80211_RATE_INFO_HE_RU_ALLOC_484;
+               break;
+       case RU_996:
+               ret = NL80211_RATE_INFO_HE_RU_ALLOC_996;
+               break;
+       }
+       return ret;
+}
+
 #define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_0 0xDDBEEF
 #define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_1 0xADBEEF
 #define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_2 0xBDBEEF