mac80211: add time synchronisation with BSS for assoc

Some drivers (iwlegacy, iwlwifi and rt2x00) today use the
bss_conf.last_tsf value. By itself though that value is
completely worthless since it may be ancient. What really
is needed is synchronisation between some device time and
the TSF.

To clarify this, rename bss_conf.last_tsf to sync_tsf and
add sync_device_ts which is obtained from rx_status which
gets a new field device_timestamp for this purpose. This
is intentionally not using the mactime field since that
is used for other things and in IBSS is expected to sync
with the IBSS's TSF which isn't necessarily true for the
device timestamp.

Also, since we have the information and it's useful even
before the connection has been established, give all the
timing details to the driver before authenticating.

Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 8 insertions, 7 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 4b503ce893d8..4efcbf89a72d 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1269,11 +1269,6 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
         struct ieee80211_bss_conf *bss_conf = &sdata->vif.bss_conf;
 
         bss_info_changed |= BSS_CHANGED_ASSOC;
-        /* set timing information */
-        bss_conf->beacon_int = cbss->beacon_interval;
-        bss_conf->last_tsf = cbss->tsf;
-
-        bss_info_changed |= BSS_CHANGED_BEACON_INT;
         bss_info_changed |= ieee80211_handle_bss_capability(sdata,
                 bss_conf->assoc_capability, bss->has_erp_value, bss->erp_value);
 
@@ -3135,9 +3130,15 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
 
                 memcpy(ifmgd->bssid, cbss->bssid, ETH_ALEN);
 
-                /* tell driver about BSSID and basic rates */
+                /* set timing information */
+                sdata->vif.bss_conf.beacon_int = cbss->beacon_interval;
+                sdata->vif.bss_conf.sync_tsf = cbss->tsf;
+                sdata->vif.bss_conf.sync_device_ts = bss->device_ts;
+
+                /* tell driver about BSSID, basic rates and timing */
                 ieee80211_bss_info_change_notify(sdata,
-                        BSS_CHANGED_BSSID | BSS_CHANGED_BASIC_RATES);
+                        BSS_CHANGED_BSSID | BSS_CHANGED_BASIC_RATES |
+                        BSS_CHANGED_BEACON_INT);
 
                 if (assoc)
                         sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);