diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-21 14:43:51 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-21 14:43:51 -0500 |
| commit | 75c8ec71fb29ed59c4b9bda2f411ed3b09164cf7 (patch) | |
| tree | c1dfd91e624b48ccefa71db573d043b639fe088f /net/mac80211/ieee80211_i.h | |
| parent | 1e60896fe07307baa5f3ca1a220dfa9792657352 (diff) | |
| parent | 77d2ece6fde80631193054edc9c9a3edad519565 (diff) | |
| download | blackbird-op-linux-75c8ec71fb29ed59c4b9bda2f411ed3b09164cf7.tar.gz blackbird-op-linux-75c8ec71fb29ed59c4b9bda2f411ed3b09164cf7.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 74748896d77b..115117c558aa 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1259,7 +1259,18 @@ static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr) is_broadcast_ether_addr(raddr); } +static inline bool +ieee80211_have_rx_timestamp(struct ieee80211_rx_status *status) +{ + WARN_ON_ONCE(status->flag & RX_FLAG_MACTIME_START && + status->flag & RX_FLAG_MACTIME_END); + return status->flag & (RX_FLAG_MACTIME_START | RX_FLAG_MACTIME_END); +} +u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, + struct ieee80211_rx_status *status, + unsigned int mpdu_len, + unsigned int mpdu_offset); int ieee80211_hw_config(struct ieee80211_local *local, u32 changed); void ieee80211_tx_set_protected(struct ieee80211_tx_data *tx); void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata, |
