diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-03-13 14:29:30 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-03-13 14:54:20 -0400 |
| commit | e9ac0745c734d39cb55ce45f1fb03a85c972b35a (patch) | |
| tree | 20c8c8c5023e9dc7060dcbce406c3ccbb851c3c8 /net | |
| parent | 7b8bcff2e0f11981dd6840f9feefe0914e4ea521 (diff) | |
| download | op-kernel-dev-e9ac0745c734d39cb55ce45f1fb03a85c972b35a.zip op-kernel-dev-e9ac0745c734d39cb55ce45f1fb03a85c972b35a.tar.gz | |
mac80211: rename bss_conf timestamp to last_tsf
This value is not really very useful by itself,
yet some drivers (including iwlwifi until I can
figure out what it should do) use it. At least
rename it to "last_tsf" to indicate the meaning
and add a note that it may be really old.
I suspect the value may become useful combined
with the rx_status->mactime, but we don't (yet)
store that value and pass it to the driver.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/driver-trace.h | 2 | ||||
| -rw-r--r-- | net/mac80211/mlme.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h index 7034209..21d6f52 100644 --- a/net/mac80211/driver-trace.h +++ b/net/mac80211/driver-trace.h @@ -296,7 +296,7 @@ TRACE_EVENT(drv_bss_info_changed, __entry->dtimper = info->dtim_period; __entry->bcnint = info->beacon_int; __entry->assoc_cap = info->assoc_capability; - __entry->timestamp = info->timestamp; + __entry->timestamp = info->last_tsf; __entry->basic_rates = info->basic_rates; __entry->enable_beacon = info->enable_beacon; __entry->ht_operation_mode = info->ht_operation_mode; diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 39c1393..90d1db3 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1318,7 +1318,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata, bss_info_changed |= BSS_CHANGED_ASSOC; /* set timing information */ bss_conf->beacon_int = cbss->beacon_interval; - bss_conf->timestamp = cbss->tsf; + bss_conf->last_tsf = cbss->tsf; bss_info_changed |= BSS_CHANGED_BEACON_INT; bss_info_changed |= ieee80211_handle_bss_capability(sdata, |
