summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
authorAlexander Bondar2013-09-15 16:17:48 +0200
committerJohannes Berg2013-10-11 15:04:34 +0200
commit2a3115434a773fdc34ea125890f75fbc0b34dcaf (patch)
tree6b426c28e114d632e9fb39848f982ebf1091e06f /drivers/net/wireless/iwlwifi
parentiwlwifi: don't WARN on bad firmware state (diff)
downloadkernel-qcow2-linux-2a3115434a773fdc34ea125890f75fbc0b34dcaf.tar.gz
kernel-qcow2-linux-2a3115434a773fdc34ea125890f75fbc0b34dcaf.tar.xz
kernel-qcow2-linux-2a3115434a773fdc34ea125890f75fbc0b34dcaf.zip
iwlwifi: mvm: fix scan request's suspend time parameter
This fix is related to a scan request when associated (bgscan). FW expects suspend time parameter in micro seconds while the driver provides a value in time units. This bug leads to a high traffic latency when scan is requested while traffic is in progress. Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/scan.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index 621fb71f282a..3a06832e8e90 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -93,10 +93,10 @@ static inline __le32 iwl_mvm_scan_max_out_time(struct ieee80211_vif *vif)
static inline __le32 iwl_mvm_scan_suspend_time(struct ieee80211_vif *vif)
{
- if (vif->bss_conf.assoc)
- return cpu_to_le32(vif->bss_conf.beacon_int);
- else
+ if (!vif->bss_conf.assoc)
return 0;
+
+ return cpu_to_le32(ieee80211_tu_to_usec(vif->bss_conf.beacon_int));
}
static inline __le32