diff options
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 4d6e6c6818d0..1937c7d98304 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -667,6 +667,9 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info) | |||
667 | * @RX_FLAG_SHORT_GI: Short guard interval was used | 667 | * @RX_FLAG_SHORT_GI: Short guard interval was used |
668 | * @RX_FLAG_NO_SIGNAL_VAL: The signal strength value is not present. | 668 | * @RX_FLAG_NO_SIGNAL_VAL: The signal strength value is not present. |
669 | * Valid only for data frames (mainly A-MPDU) | 669 | * Valid only for data frames (mainly A-MPDU) |
670 | * @RX_FLAG_HT_GF: This frame was received in a HT-greenfield transmission, if | ||
671 | * the driver fills this value it should add %IEEE80211_RADIOTAP_MCS_HAVE_FMT | ||
672 | * to hw.radiotap_mcs_details to advertise that fact | ||
670 | */ | 673 | */ |
671 | enum mac80211_rx_flags { | 674 | enum mac80211_rx_flags { |
672 | RX_FLAG_MMIC_ERROR = 1<<0, | 675 | RX_FLAG_MMIC_ERROR = 1<<0, |
@@ -681,6 +684,7 @@ enum mac80211_rx_flags { | |||
681 | RX_FLAG_40MHZ = 1<<10, | 684 | RX_FLAG_40MHZ = 1<<10, |
682 | RX_FLAG_SHORT_GI = 1<<11, | 685 | RX_FLAG_SHORT_GI = 1<<11, |
683 | RX_FLAG_NO_SIGNAL_VAL = 1<<12, | 686 | RX_FLAG_NO_SIGNAL_VAL = 1<<12, |
687 | RX_FLAG_HT_GF = 1<<13, | ||
684 | }; | 688 | }; |
685 | 689 | ||
686 | /** | 690 | /** |
@@ -939,7 +943,7 @@ static inline bool ieee80211_vif_is_mesh(struct ieee80211_vif *vif) | |||
939 | * CCMP key if it requires CCMP encryption of management frames (MFP) to | 943 | * CCMP key if it requires CCMP encryption of management frames (MFP) to |
940 | * be done in software. | 944 | * be done in software. |
941 | * @IEEE80211_KEY_FLAG_PUT_IV_SPACE: This flag should be set by the driver | 945 | * @IEEE80211_KEY_FLAG_PUT_IV_SPACE: This flag should be set by the driver |
942 | * for a CCMP key if space should be prepared for the IV, but the IV | 946 | * if space should be prepared for the IV, but the IV |
943 | * itself should not be generated. Do not set together with | 947 | * itself should not be generated. Do not set together with |
944 | * @IEEE80211_KEY_FLAG_GENERATE_IV on the same key. | 948 | * @IEEE80211_KEY_FLAG_GENERATE_IV on the same key. |
945 | */ | 949 | */ |
@@ -1288,6 +1292,11 @@ enum ieee80211_hw_flags { | |||
1288 | * | 1292 | * |
1289 | * @offchannel_tx_hw_queue: HW queue ID to use for offchannel TX | 1293 | * @offchannel_tx_hw_queue: HW queue ID to use for offchannel TX |
1290 | * (if %IEEE80211_HW_QUEUE_CONTROL is set) | 1294 | * (if %IEEE80211_HW_QUEUE_CONTROL is set) |
1295 | * | ||
1296 | * @radiotap_mcs_details: lists which MCS information can the HW | ||
1297 | * reports, by default it is set to _MCS, _GI and _BW but doesn't | ||
1298 | * include _FMT. Use %IEEE80211_RADIOTAP_MCS_HAVE_* values, only | ||
1299 | * adding _BW is supported today. | ||
1291 | */ | 1300 | */ |
1292 | struct ieee80211_hw { | 1301 | struct ieee80211_hw { |
1293 | struct ieee80211_conf conf; | 1302 | struct ieee80211_conf conf; |
@@ -1309,6 +1318,7 @@ struct ieee80211_hw { | |||
1309 | u8 max_rx_aggregation_subframes; | 1318 | u8 max_rx_aggregation_subframes; |
1310 | u8 max_tx_aggregation_subframes; | 1319 | u8 max_tx_aggregation_subframes; |
1311 | u8 offchannel_tx_hw_queue; | 1320 | u8 offchannel_tx_hw_queue; |
1321 | u8 radiotap_mcs_details; | ||
1312 | }; | 1322 | }; |
1313 | 1323 | ||
1314 | /** | 1324 | /** |