aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-5000.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-5000.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 0c9281e9f2ad..4348c7db3d1f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -94,7 +94,7 @@ static int iwl5000_apm_init(struct iwl_priv *priv)
94 iwl_set_bit(priv, CSR_GIO_CHICKEN_BITS, 94 iwl_set_bit(priv, CSR_GIO_CHICKEN_BITS,
95 CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX); 95 CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX);
96 96
97 /* Set FH wait treshold to maximum (HW error during stress W/A) */ 97 /* Set FH wait threshold to maximum (HW error during stress W/A) */
98 iwl_set_bit(priv, CSR_DBG_HPET_MEM_REG, CSR_DBG_HPET_MEM_REG_VAL); 98 iwl_set_bit(priv, CSR_DBG_HPET_MEM_REG, CSR_DBG_HPET_MEM_REG_VAL);
99 99
100 /* enable HAP INTA to move device L1a -> L0s */ 100 /* enable HAP INTA to move device L1a -> L0s */
@@ -134,7 +134,7 @@ static int iwl5000_apm_init(struct iwl_priv *priv)
134 return ret; 134 return ret;
135} 135}
136 136
137/* FIXME: this is indentical to 4965 */ 137/* FIXME: this is identical to 4965 */
138static void iwl5000_apm_stop(struct iwl_priv *priv) 138static void iwl5000_apm_stop(struct iwl_priv *priv)
139{ 139{
140 unsigned long flags; 140 unsigned long flags;
@@ -219,7 +219,7 @@ static void iwl5000_nic_config(struct iwl_priv *priv)
219 219
220 /* L1 is enabled by BIOS */ 220 /* L1 is enabled by BIOS */
221 if ((link & PCI_CFG_LINK_CTRL_VAL_L1_EN) == PCI_CFG_LINK_CTRL_VAL_L1_EN) 221 if ((link & PCI_CFG_LINK_CTRL_VAL_L1_EN) == PCI_CFG_LINK_CTRL_VAL_L1_EN)
222 /* diable L0S disabled L1A enabled */ 222 /* disable L0S disabled L1A enabled */
223 iwl_set_bit(priv, CSR_GIO_REG, CSR_GIO_REG_VAL_L0S_ENABLED); 223 iwl_set_bit(priv, CSR_GIO_REG, CSR_GIO_REG_VAL_L0S_ENABLED);
224 else 224 else
225 /* L0S enabled L1A disabled */ 225 /* L0S enabled L1A disabled */
@@ -1093,7 +1093,7 @@ static u16 iwl5000_build_addsta_hcmd(const struct iwl_addsta_cmd *cmd, u8 *data)
1093 1093
1094 1094
1095/* 1095/*
1096 * Activate/Deactivat Tx DMA/FIFO channels according tx fifos mask 1096 * Activate/Deactivate Tx DMA/FIFO channels according tx fifos mask
1097 * must be called under priv->lock and mac access 1097 * must be called under priv->lock and mac access
1098 */ 1098 */
1099static void iwl5000_txq_set_sched(struct iwl_priv *priv, u32 mask) 1099static void iwl5000_txq_set_sched(struct iwl_priv *priv, u32 mask)
@@ -1311,7 +1311,7 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv,
1311 IWL_ERROR("TODO: Implement Tx ABORT REQUIRED!!!\n"); 1311 IWL_ERROR("TODO: Implement Tx ABORT REQUIRED!!!\n");
1312} 1312}
1313 1313
1314/* Currently 5000 is the supperset of everything */ 1314/* Currently 5000 is the superset of everything */
1315static u16 iwl5000_get_hcmd_size(u8 cmd_id, u16 len) 1315static u16 iwl5000_get_hcmd_size(u8 cmd_id, u16 len)
1316{ 1316{
1317 return len; 1317 return len;