From fec74c53ee9020ff11be2464c23ab3e00ee5d51f Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 6 Jan 2011 22:36:44 +0100
Subject: [PATCH] --- yaml --- r: 231199 b: refs/heads/master c:
 610dbc980f7ad886313278ce946287f24b44cf55 h: refs/heads/master i:   231197:
 e39b4f477b5cb7101a31c939c1f396611b441089   231195:
 96df59d817f4a1ecc8caf955188492d58baa9f52   231191:
 96ce239b82ff578feec0fd684d035880946eb1f0   231183:
 9140bfb952e4cced616957852977aa947977ae24   231167:
 8c6008e0f04743607ab938ad81d1366ce2ee3286 v: v3

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

diff --git a/[refs] b/[refs]
index d63fa59bac4a..2fd87d3a37c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55de80d64545e5c4cca7f574fdf04b1f02a5f8fd
+refs/heads/master: 610dbc980f7ad886313278ce946287f24b44cf55
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index 3ce8e1f70c06..62c0ce2d1dc8 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -337,6 +337,10 @@ struct ieee80211_bss_conf {
  * @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.
+ * @IEEE80211_TX_CTL_TX_OFFCHAN: Marks this packet to be transmitted on
+ *	the off-channel channel when a remain-on-channel offload is done
+ *	in hardware -- normal packets still flow and are expected to be
+ *	handled properly by the device.
  *
  * Note: If you have to add new flags to the enumeration, then don't
  *	 forget to update %IEEE80211_TX_TEMPORARY_FLAGS when necessary.