From adc887c29cbde678ccb59734758824e016b362d3 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 19 Apr 2010 19:57:35 +0200
Subject: [PATCH] --- yaml --- r: 194510 b: refs/heads/master c:
 f79d9bad37cb1e7ef23d60b1dd0b7859957ced9e h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/ieee80211.h | 1 +
 trunk/include/net/mac80211.h    | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 166da48b54e9..1ada43385f2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bb065a7420c90421d6bbea5f7cffe36bd79a048
+refs/heads/master: f79d9bad37cb1e7ef23d60b1dd0b7859957ced9e
diff --git a/trunk/include/linux/ieee80211.h b/trunk/include/linux/ieee80211.h
index 1252ba1fbff5..97b2eae6a22c 100644
--- a/trunk/include/linux/ieee80211.h
+++ b/trunk/include/linux/ieee80211.h
@@ -876,6 +876,7 @@ struct ieee80211_ht_cap {
 #define IEEE80211_HT_CAP_SGI_40			0x0040
 #define IEEE80211_HT_CAP_TX_STBC		0x0080
 #define IEEE80211_HT_CAP_RX_STBC		0x0300
+#define		IEEE80211_HT_CAP_RX_STBC_SHIFT	8
 #define IEEE80211_HT_CAP_DELAY_BA		0x0400
 #define IEEE80211_HT_CAP_MAX_AMSDU		0x0800
 #define IEEE80211_HT_CAP_DSSSCCK40		0x1000
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index 0e2a1a9b2b65..7dc5a6790397 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -275,6 +275,8 @@ struct ieee80211_bss_conf {
  *	MLME command (internal to mac80211 to figure out whether to send TX
  *	status to user space)
  * @IEEE80211_TX_CTL_LDPC: tells the driver to use LDPC for this frame
+ * @IEEE80211_TX_CTL_STBC: Enables Space-Time Block Coding (STBC) for this
+ *	frame and selects the maximum number of streams that it can use.
  */
 enum mac80211_tx_control_flags {
 	IEEE80211_TX_CTL_REQ_TX_STATUS		= BIT(0),
@@ -299,6 +301,8 @@ enum mac80211_tx_control_flags {
 	IEEE80211_TX_INTFL_HAS_RADIOTAP		= BIT(20),
 	IEEE80211_TX_INTFL_NL80211_FRAME_TX	= BIT(21),
 	IEEE80211_TX_CTL_LDPC			= BIT(22),
+	IEEE80211_TX_CTL_STBC			= BIT(23) | BIT(24),
+#define IEEE80211_TX_CTL_STBC_SHIFT		23
 };
 
 /**