From 9779fe03c681ff674b5b35fe0612361a5e29b186 Mon Sep 17 00:00:00 2001
From: Bruno Randolf <br1@einfach.org>
Date: Wed, 30 Jul 2008 17:19:55 +0200
Subject: [PATCH] --- yaml --- r: 111171 b: refs/heads/master c:
 b4f28bbb9bf0b2c829ecf97ce2173f204fde4f10 h: refs/heads/master i:   111169:
 8a62960666603c3799784f9db3b0ab2ec5a5ca49   111167:
 86471e5e50f291973556a822b96acc356e531df8 v: v3

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

diff --git a/[refs] b/[refs]
index c5f0cfaa961c..8043fa82f2ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63266a653589e1a237527479f10212ea77ce7844
+refs/heads/master: b4f28bbb9bf0b2c829ecf97ce2173f204fde4f10
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index 25cc192cbe4c..dcc05a197dc1 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -363,6 +363,7 @@ static inline struct ieee80211_tx_info *IEEE80211_SKB_CB(struct sk_buff *skb)
  * @RX_FLAG_TSFT: The timestamp passed in the RX status (@mactime field)
  *	is valid. This is useful in monitor mode and necessary for beacon frames
  *	to enable IBSS merging.
+ * @RX_FLAG_SHORTPRE: Short preamble was used for this frame
  */
 enum mac80211_rx_flags {
 	RX_FLAG_MMIC_ERROR	= 1<<0,
@@ -373,6 +374,7 @@ enum mac80211_rx_flags {
 	RX_FLAG_FAILED_FCS_CRC	= 1<<5,
 	RX_FLAG_FAILED_PLCP_CRC = 1<<6,
 	RX_FLAG_TSFT		= 1<<7,
+	RX_FLAG_SHORTPRE	= 1<<8
 };
 
 /**
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 6db854505193..ad47a614a202 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -143,6 +143,8 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
 	/* IEEE80211_RADIOTAP_FLAGS */
 	if (local->hw.flags & IEEE80211_HW_RX_INCLUDES_FCS)
 		*pos |= IEEE80211_RADIOTAP_F_FCS;
+	if (status->flag & RX_FLAG_SHORTPRE)
+		*pos |= IEEE80211_RADIOTAP_F_SHORTPRE;
 	pos++;
 
 	/* IEEE80211_RADIOTAP_RATE */