diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-11-09 09:07:02 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-11-26 06:42:59 -0500 |
commit | 5614618ec498320e3b686fea246e50b833865c34 (patch) | |
tree | a319fd5575bc7ee090136e6e7829200a152886cf /include/net/mac80211.h | |
parent | db9c64cf8d9d3fcbc34b09d037f266d1fc9f928c (diff) |
mac80211: support drivers reporting VHT RX
Add support to mac80211 for having drivers report
received VHT MCS information.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r-- | include/net/mac80211.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 6af51328dcd1..598ea215fc3b 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -717,7 +717,11 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info) | |||
717 | * (including FCS) was received. | 717 | * (including FCS) was received. |
718 | * @RX_FLAG_SHORTPRE: Short preamble was used for this frame | 718 | * @RX_FLAG_SHORTPRE: Short preamble was used for this frame |
719 | * @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index | 719 | * @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index |
720 | * @RX_FLAG_VHT: VHT MCS was used and rate_index is MCS index | ||
720 | * @RX_FLAG_40MHZ: HT40 (40 MHz) was used | 721 | * @RX_FLAG_40MHZ: HT40 (40 MHz) was used |
722 | * @RX_FLAG_80MHZ: 80 MHz was used | ||
723 | * @RX_FLAG_80P80MHZ: 80+80 MHz was used | ||
724 | * @RX_FLAG_160MHZ: 160 MHz was used | ||
721 | * @RX_FLAG_SHORT_GI: Short guard interval was used | 725 | * @RX_FLAG_SHORT_GI: Short guard interval was used |
722 | * @RX_FLAG_NO_SIGNAL_VAL: The signal strength value is not present. | 726 | * @RX_FLAG_NO_SIGNAL_VAL: The signal strength value is not present. |
723 | * Valid only for data frames (mainly A-MPDU) | 727 | * Valid only for data frames (mainly A-MPDU) |
@@ -760,6 +764,10 @@ enum mac80211_rx_flags { | |||
760 | RX_FLAG_AMPDU_DELIM_CRC_ERROR = BIT(19), | 764 | RX_FLAG_AMPDU_DELIM_CRC_ERROR = BIT(19), |
761 | RX_FLAG_AMPDU_DELIM_CRC_KNOWN = BIT(20), | 765 | RX_FLAG_AMPDU_DELIM_CRC_KNOWN = BIT(20), |
762 | RX_FLAG_MACTIME_END = BIT(21), | 766 | RX_FLAG_MACTIME_END = BIT(21), |
767 | RX_FLAG_VHT = BIT(22), | ||
768 | RX_FLAG_80MHZ = BIT(23), | ||
769 | RX_FLAG_80P80MHZ = BIT(24), | ||
770 | RX_FLAG_160MHZ = BIT(25), | ||
763 | }; | 771 | }; |
764 | 772 | ||
765 | /** | 773 | /** |
@@ -780,7 +788,8 @@ enum mac80211_rx_flags { | |||
780 | * @IEEE80211_HW_SIGNAL_* | 788 | * @IEEE80211_HW_SIGNAL_* |
781 | * @antenna: antenna used | 789 | * @antenna: antenna used |
782 | * @rate_idx: index of data rate into band's supported rates or MCS index if | 790 | * @rate_idx: index of data rate into band's supported rates or MCS index if |
783 | * HT rates are use (RX_FLAG_HT) | 791 | * HT or VHT is used (%RX_FLAG_HT/%RX_FLAG_VHT) |
792 | * @vht_nss: number of streams (VHT only) | ||
784 | * @flag: %RX_FLAG_* | 793 | * @flag: %RX_FLAG_* |
785 | * @rx_flags: internal RX flags for mac80211 | 794 | * @rx_flags: internal RX flags for mac80211 |
786 | * @ampdu_reference: A-MPDU reference number, must be a different value for | 795 | * @ampdu_reference: A-MPDU reference number, must be a different value for |
@@ -803,6 +812,7 @@ struct ieee80211_rx_status { | |||
803 | u16 vendor_radiotap_len; | 812 | u16 vendor_radiotap_len; |
804 | u16 freq; | 813 | u16 freq; |
805 | u8 rate_idx; | 814 | u8 rate_idx; |
815 | u8 vht_nss; | ||
806 | u8 rx_flags; | 816 | u8 rx_flags; |
807 | u8 band; | 817 | u8 band; |
808 | u8 antenna; | 818 | u8 antenna; |