diff options
-rw-r--r-- | include/linux/ieee80211.h | 1 | ||||
-rw-r--r-- | include/net/mac80211.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 1252ba1fbff5..97b2eae6a22c 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
@@ -876,6 +876,7 @@ struct ieee80211_ht_cap { | |||
876 | #define IEEE80211_HT_CAP_SGI_40 0x0040 | 876 | #define IEEE80211_HT_CAP_SGI_40 0x0040 |
877 | #define IEEE80211_HT_CAP_TX_STBC 0x0080 | 877 | #define IEEE80211_HT_CAP_TX_STBC 0x0080 |
878 | #define IEEE80211_HT_CAP_RX_STBC 0x0300 | 878 | #define IEEE80211_HT_CAP_RX_STBC 0x0300 |
879 | #define IEEE80211_HT_CAP_RX_STBC_SHIFT 8 | ||
879 | #define IEEE80211_HT_CAP_DELAY_BA 0x0400 | 880 | #define IEEE80211_HT_CAP_DELAY_BA 0x0400 |
880 | #define IEEE80211_HT_CAP_MAX_AMSDU 0x0800 | 881 | #define IEEE80211_HT_CAP_MAX_AMSDU 0x0800 |
881 | #define IEEE80211_HT_CAP_DSSSCCK40 0x1000 | 882 | #define IEEE80211_HT_CAP_DSSSCCK40 0x1000 |
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 0e2a1a9b2b65..7dc5a6790397 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -275,6 +275,8 @@ struct ieee80211_bss_conf { | |||
275 | * MLME command (internal to mac80211 to figure out whether to send TX | 275 | * MLME command (internal to mac80211 to figure out whether to send TX |
276 | * status to user space) | 276 | * status to user space) |
277 | * @IEEE80211_TX_CTL_LDPC: tells the driver to use LDPC for this frame | 277 | * @IEEE80211_TX_CTL_LDPC: tells the driver to use LDPC for this frame |
278 | * @IEEE80211_TX_CTL_STBC: Enables Space-Time Block Coding (STBC) for this | ||
279 | * frame and selects the maximum number of streams that it can use. | ||
278 | */ | 280 | */ |
279 | enum mac80211_tx_control_flags { | 281 | enum mac80211_tx_control_flags { |
280 | IEEE80211_TX_CTL_REQ_TX_STATUS = BIT(0), | 282 | IEEE80211_TX_CTL_REQ_TX_STATUS = BIT(0), |
@@ -299,6 +301,8 @@ enum mac80211_tx_control_flags { | |||
299 | IEEE80211_TX_INTFL_HAS_RADIOTAP = BIT(20), | 301 | IEEE80211_TX_INTFL_HAS_RADIOTAP = BIT(20), |
300 | IEEE80211_TX_INTFL_NL80211_FRAME_TX = BIT(21), | 302 | IEEE80211_TX_INTFL_NL80211_FRAME_TX = BIT(21), |
301 | IEEE80211_TX_CTL_LDPC = BIT(22), | 303 | IEEE80211_TX_CTL_LDPC = BIT(22), |
304 | IEEE80211_TX_CTL_STBC = BIT(23) | BIT(24), | ||
305 | #define IEEE80211_TX_CTL_STBC_SHIFT 23 | ||
302 | }; | 306 | }; |
303 | 307 | ||
304 | /** | 308 | /** |