From: Alexander Bondar <alexander.bondar@intel.com>
Date: Tue, 5 Mar 2013 08:41:34 +0000 (+0200)
Subject: iwlwifi: mvm: Fix active-to-powersave transition time units
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7c1bf93fb299b739d2ca145b7f2a129c8d7a84c1;p=openwrt%2Fstaging%2Fblogic.git

iwlwifi: mvm: Fix active-to-powersave transition time units

Active to power save mode transition time for TX/RX in the power
table command is in microseconds, fix the units in the driver.

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

diff --git a/drivers/net/wireless/iwlwifi/mvm/power.c b/drivers/net/wireless/iwlwifi/mvm/power.c
index 7a278f31a8a7..f66694c617e6 100644
--- a/drivers/net/wireless/iwlwifi/mvm/power.c
+++ b/drivers/net/wireless/iwlwifi/mvm/power.c
@@ -120,11 +120,11 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm,
 
 	if (iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_LP) {
 		/* TODO: Also for D3 (device sleep / WoWLAN) */
-		cmd->rx_data_timeout = cpu_to_le32(10);
-		cmd->tx_data_timeout = cpu_to_le32(10);
+		cmd->rx_data_timeout = cpu_to_le32(10 * USEC_PER_MSEC);
+		cmd->tx_data_timeout = cpu_to_le32(10 * USEC_PER_MSEC);
 	} else {
-		cmd->rx_data_timeout = cpu_to_le32(50);
-		cmd->tx_data_timeout = cpu_to_le32(50);
+		cmd->rx_data_timeout = cpu_to_le32(50 * USEC_PER_MSEC);
+		cmd->tx_data_timeout = cpu_to_le32(50 * USEC_PER_MSEC);
 	}
 }