aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorThomas Pedersen <thomas@cozybit.com>2012-11-13 13:46:27 -0500
committerJohannes Berg <johannes.berg@intel.com>2012-11-13 15:43:55 -0500
commitf4bda337bbb6e245e2a07f344990adeb6a70ff35 (patch)
tree6ccf2bc38fb67098df931ce55eb0905959813864 /include
parent2a91c9f781de209d420d751e43eb43ffe6934803 (diff)
mac80211: support RX_FLAG_MACTIME_END
Allow drivers to indicate their mactime is at RX completion and adjust for this in mac80211. Also rename the existing RX_FLAG_MACTIME_MPDU to RX_FLAG_MACTIME_START to clarify its intent. Based on similar code by Johannes Berg. Signed-off-by: Thomas Pedersen <thomas@cozybit.com> [fix docs, atheros drivers] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/net/mac80211.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index a789dd1d4c10..b484a6569eac 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -711,10 +711,13 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
711 * the frame. 711 * the frame.
712 * @RX_FLAG_FAILED_PLCP_CRC: Set this flag if the PCLP check failed on 712 * @RX_FLAG_FAILED_PLCP_CRC: Set this flag if the PCLP check failed on
713 * the frame. 713 * the frame.
714 * @RX_FLAG_MACTIME_MPDU: The timestamp passed in the RX status (@mactime 714 * @RX_FLAG_MACTIME_START: The timestamp passed in the RX status (@mactime
715 * field) is valid and contains the time the first symbol of the MPDU 715 * field) is valid and contains the time the first symbol of the MPDU
716 * was received. This is useful in monitor mode and for proper IBSS 716 * was received. This is useful in monitor mode and for proper IBSS
717 * merging. 717 * merging.
718 * @RX_FLAG_MACTIME_END: The timestamp passed in the RX status (@mactime
719 * field) is valid and contains the time the last symbol of the MPDU
720 * (including FCS) was received.
718 * @RX_FLAG_SHORTPRE: Short preamble was used for this frame 721 * @RX_FLAG_SHORTPRE: Short preamble was used for this frame
719 * @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index 722 * @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index
720 * @RX_FLAG_40MHZ: HT40 (40 MHz) was used 723 * @RX_FLAG_40MHZ: HT40 (40 MHz) was used
@@ -745,7 +748,7 @@ enum mac80211_rx_flags {
745 RX_FLAG_IV_STRIPPED = BIT(4), 748 RX_FLAG_IV_STRIPPED = BIT(4),
746 RX_FLAG_FAILED_FCS_CRC = BIT(5), 749 RX_FLAG_FAILED_FCS_CRC = BIT(5),
747 RX_FLAG_FAILED_PLCP_CRC = BIT(6), 750 RX_FLAG_FAILED_PLCP_CRC = BIT(6),
748 RX_FLAG_MACTIME_MPDU = BIT(7), 751 RX_FLAG_MACTIME_START = BIT(7),
749 RX_FLAG_SHORTPRE = BIT(8), 752 RX_FLAG_SHORTPRE = BIT(8),
750 RX_FLAG_HT = BIT(9), 753 RX_FLAG_HT = BIT(9),
751 RX_FLAG_40MHZ = BIT(10), 754 RX_FLAG_40MHZ = BIT(10),
@@ -759,6 +762,7 @@ enum mac80211_rx_flags {
759 RX_FLAG_AMPDU_IS_LAST = BIT(18), 762 RX_FLAG_AMPDU_IS_LAST = BIT(18),
760 RX_FLAG_AMPDU_DELIM_CRC_ERROR = BIT(19), 763 RX_FLAG_AMPDU_DELIM_CRC_ERROR = BIT(19),
761 RX_FLAG_AMPDU_DELIM_CRC_KNOWN = BIT(20), 764 RX_FLAG_AMPDU_DELIM_CRC_KNOWN = BIT(20),
765 RX_FLAG_MACTIME_END = BIT(21),
762}; 766};
763 767
764/** 768/**