diff options
| author | Greg Kroah-Hartman | 2015-08-10 18:07:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-08-10 18:07:25 +0200 |
| commit | f70d6318320983a8d2fac28cfe8d22dfd5e52a73 (patch) | |
| tree | e3a427a3abeca491007f036b09be84944657f58e /drivers/staging/vt6655/device_main.c | |
| parent | Staging: lustre/lustre/ptlrpc: service.c: Fixed issue with global integer bei... (diff) | |
| parent | Linux 4.2-rc6 (diff) | |
| download | kernel-qcow2-linux-f70d6318320983a8d2fac28cfe8d22dfd5e52a73.tar.gz kernel-qcow2-linux-f70d6318320983a8d2fac28cfe8d22dfd5e52a73.tar.xz kernel-qcow2-linux-f70d6318320983a8d2fac28cfe8d22dfd5e52a73.zip | |
Merge 4.2-rc6 into staging-next
We want the IIO and staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655/device_main.c')
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index c97353bfab72..b74af8d89fe6 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1456,8 +1456,9 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, } } - if (changed & BSS_CHANGED_ASSOC && priv->op_mode != NL80211_IFTYPE_AP) { - if (conf->assoc) { + if (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_BEACON_INFO) && + priv->op_mode != NL80211_IFTYPE_AP) { + if (conf->assoc && conf->beacon_rate) { CARDbUpdateTSF(priv, conf->beacon_rate->hw_value, conf->sync_tsf); |