Commit 570af86e authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: remove duplicated define 



Duplicated define for listen interval (IWL_CONN_MAX_LISTEN_INTERVAL and
IWL_CONN_LISTEN_INTERVAL), remove IWL_CONN_LISTEN_INTERVAL

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Reported-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7300515d

drivers/net/wireless/iwlwifi/iwl-power.c

+2 −2
Original line number Diff line number Diff line
@@ -163,9 +163,9 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv, 
		cmd->flags &= ~IWL_POWER_SLEEP_OVER_DTIM_MSK;



	slp_itrvl = le32_to_cpu(cmd->sleep_interval[IWL_POWER_VEC_SIZE - 1]);

	if (slp_itrvl > IWL_CONN_LISTEN_INTERVAL)

	if (slp_itrvl > IWL_CONN_MAX_LISTEN_INTERVAL)

		cmd->sleep_interval[IWL_POWER_VEC_SIZE - 1] =

			cpu_to_le32(IWL_CONN_LISTEN_INTERVAL);

			cpu_to_le32(IWL_CONN_MAX_LISTEN_INTERVAL);



	/* enforce max sleep interval */

	for (i = IWL_POWER_VEC_SIZE - 1; i >= 0 ; i--) {

drivers/net/wireless/iwlwifi/iwl-power.h

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 


#include "iwl-commands.h"



#define IWL_CONN_LISTEN_INTERVAL	10



#define IWL_ABSOLUTE_ZERO		0

#define IWL_ABSOLUTE_MAX		0xFFFFFFFF

#define IWL_TT_INCREASE_MARGIN	5