summaryrefslogtreecommitdiffstats
path: root/include/net/mac80211.h
diff options
context:
space:
mode:
authorJohannes Berg2011-02-23 15:06:08 +0100
committerJohn W. Linville2011-02-23 22:25:29 +0100
commit6ebacbb79d2d05978ba50a24d8cbe2a76ff2014c (patch)
treed67c83455f81132bbed9c421c55f53e6e61169af /include/net/mac80211.h
parentmac80211: Fix a race on enabling power save. (diff)
downloadkernel-qcow2-linux-6ebacbb79d2d05978ba50a24d8cbe2a76ff2014c.tar.gz
kernel-qcow2-linux-6ebacbb79d2d05978ba50a24d8cbe2a76ff2014c.tar.xz
kernel-qcow2-linux-6ebacbb79d2d05978ba50a24d8cbe2a76ff2014c.zip
mac80211: rename RX_FLAG_TSFT
The flag isn't very descriptive -- the intention is that the driver provides a TSF timestamp at the beginning of the MPDU -- make that clearer by renaming the flag to RX_FLAG_MACTIME_MPDU. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 8fcd1691cfb7..a13c8d8fca5c 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -599,9 +599,10 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
* the frame.
* @RX_FLAG_FAILED_PLCP_CRC: Set this flag if the PCLP check failed on
* the frame.
- * @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_MACTIME_MPDU: The timestamp passed in the RX status (@mactime
+ * field) is valid and contains the time the first symbol of the MPDU
+ * was received. This is useful in monitor mode and for proper IBSS
+ * merging.
* @RX_FLAG_SHORTPRE: Short preamble was used for this frame
* @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index
* @RX_FLAG_40MHZ: HT40 (40 MHz) was used
@@ -614,7 +615,7 @@ enum mac80211_rx_flags {
RX_FLAG_IV_STRIPPED = 1<<4,
RX_FLAG_FAILED_FCS_CRC = 1<<5,
RX_FLAG_FAILED_PLCP_CRC = 1<<6,
- RX_FLAG_TSFT = 1<<7,
+ RX_FLAG_MACTIME_MPDU = 1<<7,
RX_FLAG_SHORTPRE = 1<<8,
RX_FLAG_HT = 1<<9,
RX_FLAG_40MHZ = 1<<10,