Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

[deliverable/linux.git] / drivers / net / wireless / iwlegacy / common.c

diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index 0f8a7703eea3c493486bc09b049a77f6a89a7a9b..0370403fd0bd5d2345704f8fc766c5ad2260a7dc 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -5359,7 +5359,7 @@ il_mac_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
        if (changes & BSS_CHANGED_ASSOC) {
                D_MAC80211("ASSOC %d\n", bss_conf->assoc);
                if (bss_conf->assoc) {
-                       il->timestamp = bss_conf->last_tsf;
+                       il->timestamp = bss_conf->sync_tsf;
 
                        if (!il_is_rfkill(il))
                                il->ops->post_associate(il);