diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2009-10-23 16:42:33 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-27 16:50:03 -0400 |
commit | 570af86e0ab7e7b42b2562ff3209c16ab1ebd5f8 (patch) | |
tree | f0a69fe800489fd44de01f904ef562276ce3150a /drivers | |
parent | 7300515d1095aa11731866da7c9b000f2edb4626 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-power.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-power.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index 432f4650cf2e..9bce2c1625e3 100644 --- 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, | |||
163 | cmd->flags &= ~IWL_POWER_SLEEP_OVER_DTIM_MSK; | 163 | cmd->flags &= ~IWL_POWER_SLEEP_OVER_DTIM_MSK; |
164 | 164 | ||
165 | slp_itrvl = le32_to_cpu(cmd->sleep_interval[IWL_POWER_VEC_SIZE - 1]); | 165 | slp_itrvl = le32_to_cpu(cmd->sleep_interval[IWL_POWER_VEC_SIZE - 1]); |
166 | if (slp_itrvl > IWL_CONN_LISTEN_INTERVAL) | 166 | if (slp_itrvl > IWL_CONN_MAX_LISTEN_INTERVAL) |
167 | cmd->sleep_interval[IWL_POWER_VEC_SIZE - 1] = | 167 | cmd->sleep_interval[IWL_POWER_VEC_SIZE - 1] = |
168 | cpu_to_le32(IWL_CONN_LISTEN_INTERVAL); | 168 | cpu_to_le32(IWL_CONN_MAX_LISTEN_INTERVAL); |
169 | 169 | ||
170 | /* enforce max sleep interval */ | 170 | /* enforce max sleep interval */ |
171 | for (i = IWL_POWER_VEC_SIZE - 1; i >= 0 ; i--) { | 171 | 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 0755518f86e1..310c32e8f698 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.h +++ b/drivers/net/wireless/iwlwifi/iwl-power.h | |||
@@ -30,8 +30,6 @@ | |||
30 | 30 | ||
31 | #include "iwl-commands.h" | 31 | #include "iwl-commands.h" |
32 | 32 | ||
33 | #define IWL_CONN_LISTEN_INTERVAL 10 | ||
34 | |||
35 | #define IWL_ABSOLUTE_ZERO 0 | 33 | #define IWL_ABSOLUTE_ZERO 0 |
36 | #define IWL_ABSOLUTE_MAX 0xFFFFFFFF | 34 | #define IWL_ABSOLUTE_MAX 0xFFFFFFFF |
37 | #define IWL_TT_INCREASE_MARGIN 5 | 35 | #define IWL_TT_INCREASE_MARGIN 5 |