---

yaml --- r: 369848 b: refs/heads/master c: 0aed849 h: refs/heads/master v: v3
git-mirror · Apr 16, 2013 · ac4ddc5 · ac4ddc5
1 parent 82b33b3
commit ac4ddc5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7dad550e6ddb96db9d3e4d322f7d1dd8a6a9c8d
+refs/heads/master: 0aed849f61c1235041f98e4178d0a60aaa1dc548
diff --git a/trunk/drivers/net/wireless/iwlwifi/mvm/power.c b/trunk/drivers/net/wireless/iwlwifi/mvm/power.c
@@ -146,14 +146,8 @@ void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 	keep_alive = DIV_ROUND_UP(keep_alive, MSEC_PER_SEC);
 	cmd->keep_alive_seconds = keep_alive;
 
-	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 * USEC_PER_MSEC);
-		cmd->tx_data_timeout = cpu_to_le32(10 * USEC_PER_MSEC);
-	} else {
-		cmd->rx_data_timeout = cpu_to_le32(100 * USEC_PER_MSEC);
-		cmd->tx_data_timeout = cpu_to_le32(100 * USEC_PER_MSEC);
-	}
+	cmd->rx_data_timeout = cpu_to_le32(100 * USEC_PER_MSEC);
+	cmd->tx_data_timeout = cpu_to_le32(100 * USEC_PER_MSEC);
 }
 
 int iwl_mvm_power_update_mode(struct iwl_mvm *mvm, struct ieee80211_vif *vif)