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: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Reported-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c
index 432f4650cf2e7718126af3933703bdd4ccf218e1..9bce2c1625e3e085b46559a59f2f2b5e005a5adb 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-power.c
+++ b/drivers/net/wireless/iwlwifi/iwl-power.c
@@ -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--) {

diff --git a/drivers/net/wireless/iwlwifi/iwl-power.h b/drivers/net/wireless/iwlwifi/iwl-power.h
index 0755518f86e1c001b0ae7a0f6076389c23fcc656..310c32e8f6989672a569c6ce9a2d0b970689aab5 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-power.h
+++ b/drivers/net/wireless/iwlwifi/iwl-power.h
@@ -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