aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ibss.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-02-23 09:06:08 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-02-23 16:25:29 -0500
commit6ebacbb79d2d05978ba50a24d8cbe2a76ff2014c (patch)
treed67c83455f81132bbed9c421c55f53e6e61169af /net/mac80211/ibss.c
parentf3e85b9edeaf8ad0446a37a40c873f3f8898c57d (diff)
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 'net/mac80211/ibss.c')
-rw-r--r--net/mac80211/ibss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index a42aa61269ea..463271f9492e 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -355,7 +355,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
355 if (memcmp(cbss->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0) 355 if (memcmp(cbss->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0)
356 goto put_bss; 356 goto put_bss;
357 357
358 if (rx_status->flag & RX_FLAG_TSFT) { 358 if (rx_status->flag & RX_FLAG_MACTIME_MPDU) {
359 /* 359 /*
360 * For correct IBSS merging we need mactime; since mactime is 360 * For correct IBSS merging we need mactime; since mactime is
361 * defined as the time the first data symbol of the frame hits 361 * defined as the time the first data symbol of the frame hits