diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-07-12 21:21:05 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-12 21:21:05 +0200 |
| commit | d07d152892aadd8dc3209ecef6788dfc83475676 (patch) | |
| tree | 0f140aa244ddc2c52494155342298cef64fc8456 /drivers/net/wireless/iwlegacy | |
| parent | ath5k: replace modparam_all_channels with CONFIG_ATH5K_TEST_CHANNELS (diff) | |
| parent | mac80211: iterate the virtual monitor interface (diff) | |
| download | linux-d07d152892aadd8dc3209ecef6788dfc83475676.tar.xz linux-d07d152892aadd8dc3209ecef6788dfc83475676.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/iwmc3200wifi/cfg80211.c
drivers/net/wireless/mwifiex/cfg80211.c
Diffstat (limited to 'drivers/net/wireless/iwlegacy')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c index 0f8a7703eea3..0370403fd0bd 100644 --- 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); |