Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5387b348 authored by Avri Altman's avatar Avri Altman Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: Fix the keep_alive calculation 



The driver must set the keep alive period regardless of power
management state. The keep alive period must be greater or equal to
both the NIC's maximum sleep period, and the listen interval.
However, we were confusing time units (TU) and msec, so fix that.

Signed-off-by: default avatarAvri Altman <avri.altman@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 886ca9f5

drivers/net/wireless/iwlwifi/mvm/power.c

+4 −5
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm, 
				    struct ieee80211_vif *vif,

				    struct iwl_mac_power_cmd *cmd)

{

	int dtimper, dtimper_msec, bi;

	int dtimper, bi;

	int keep_alive;

	bool radar_detect = false;

	struct iwl_mvm_vif *mvmvif __maybe_unused =
@@ -346,10 +346,9 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm, 
	 * immediately after association. Check that keep alive period

	 * is at least 3 * DTIM

	 */

	dtimper_msec = dtimper * bi;

	keep_alive = max_t(int, 3 * dtimper_msec,

			   MSEC_PER_SEC * POWER_KEEP_ALIVE_PERIOD_SEC);

	keep_alive = DIV_ROUND_UP(keep_alive, MSEC_PER_SEC);

	keep_alive = DIV_ROUND_UP(ieee80211_tu_to_usec(3 * dtimper * bi),

				  USEC_PER_SEC);

	keep_alive = max(keep_alive, POWER_KEEP_ALIVE_PERIOD_SEC);

	cmd->keep_alive_seconds = cpu_to_le16(keep_alive);



	if (mvm->ps_disabled)