aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2008-10-24 02:48:56 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-10-31 19:02:28 -0400
commita96a27f97f2bbfc1fca54bc3c0b0d41484152740 (patch)
treef9f6611156a01fbe97b38fb92aa078b2fc01d929 /drivers/net/wireless/iwlwifi/iwl3945-base.c
parent127901ab69bbb263fb2b46e850cf20c57ac321d3 (diff)
iwlwifi: run through spell checker
Signed-off-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/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 8009094503e4..a4d92471363e 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -1805,7 +1805,7 @@ static void iwl3945_activate_qos(struct iwl3945_priv *priv, u8 force)
1805 spin_unlock_irqrestore(&priv->lock, flags); 1805 spin_unlock_irqrestore(&priv->lock, flags);
1806 1806
1807 if (force || iwl3945_is_associated(priv)) { 1807 if (force || iwl3945_is_associated(priv)) {
1808 IWL_DEBUG_QOS("send QoS cmd with Qos active %d \n", 1808 IWL_DEBUG_QOS("send QoS cmd with QoS active %d \n",
1809 priv->qos_data.qos_active); 1809 priv->qos_data.qos_active);
1810 1810
1811 iwl3945_send_qos_params_command(priv, 1811 iwl3945_send_qos_params_command(priv,
@@ -1829,7 +1829,7 @@ static void iwl3945_activate_qos(struct iwl3945_priv *priv, u8 force)
1829 1829
1830 1830
1831/* default power management (not Tx power) table values */ 1831/* default power management (not Tx power) table values */
1832/* for tim 0-10 */ 1832/* for TIM 0-10 */
1833static struct iwl3945_power_vec_entry range_0[IWL_POWER_AC] = { 1833static struct iwl3945_power_vec_entry range_0[IWL_POWER_AC] = {
1834 {{NOSLP, SLP_TIMEOUT(0), SLP_TIMEOUT(0), SLP_VEC(0, 0, 0, 0, 0)}, 0}, 1834 {{NOSLP, SLP_TIMEOUT(0), SLP_TIMEOUT(0), SLP_VEC(0, 0, 0, 0, 0)}, 0},
1835 {{SLP, SLP_TIMEOUT(200), SLP_TIMEOUT(500), SLP_VEC(1, 2, 3, 4, 4)}, 0}, 1835 {{SLP, SLP_TIMEOUT(200), SLP_TIMEOUT(500), SLP_VEC(1, 2, 3, 4, 4)}, 0},
@@ -1839,7 +1839,7 @@ static struct iwl3945_power_vec_entry range_0[IWL_POWER_AC] = {
1839 {{SLP, SLP_TIMEOUT(25), SLP_TIMEOUT(25), SLP_VEC(4, 7, 10, 10, 10)}, 1} 1839 {{SLP, SLP_TIMEOUT(25), SLP_TIMEOUT(25), SLP_VEC(4, 7, 10, 10, 10)}, 1}
1840}; 1840};
1841 1841
1842/* for tim > 10 */ 1842/* for TIM > 10 */
1843static struct iwl3945_power_vec_entry range_1[IWL_POWER_AC] = { 1843static struct iwl3945_power_vec_entry range_1[IWL_POWER_AC] = {
1844 {{NOSLP, SLP_TIMEOUT(0), SLP_TIMEOUT(0), SLP_VEC(0, 0, 0, 0, 0)}, 0}, 1844 {{NOSLP, SLP_TIMEOUT(0), SLP_TIMEOUT(0), SLP_VEC(0, 0, 0, 0, 0)}, 0},
1845 {{SLP, SLP_TIMEOUT(200), SLP_TIMEOUT(500), 1845 {{SLP, SLP_TIMEOUT(200), SLP_TIMEOUT(500),
@@ -2282,7 +2282,7 @@ static int iwl3945_set_mode(struct iwl3945_priv *priv, int mode)
2282 2282
2283 iwl3945_clear_stations_table(priv); 2283 iwl3945_clear_stations_table(priv);
2284 2284
2285 /* dont commit rxon if rf-kill is on*/ 2285 /* don't commit rxon if rf-kill is on*/
2286 if (!iwl3945_is_ready_rf(priv)) 2286 if (!iwl3945_is_ready_rf(priv))
2287 return -EAGAIN; 2287 return -EAGAIN;
2288 2288
@@ -2311,7 +2311,7 @@ static void iwl3945_build_tx_cmd_hwcrypto(struct iwl3945_priv *priv,
2311 case ALG_CCMP: 2311 case ALG_CCMP:
2312 cmd->cmd.tx.sec_ctl = TX_CMD_SEC_CCM; 2312 cmd->cmd.tx.sec_ctl = TX_CMD_SEC_CCM;
2313 memcpy(cmd->cmd.tx.key, keyinfo->key, keyinfo->keylen); 2313 memcpy(cmd->cmd.tx.key, keyinfo->key, keyinfo->keylen);
2314 IWL_DEBUG_TX("tx_cmd with aes hwcrypto\n"); 2314 IWL_DEBUG_TX("tx_cmd with AES hwcrypto\n");
2315 break; 2315 break;
2316 2316
2317 case ALG_TKIP: 2317 case ALG_TKIP:
@@ -4002,7 +4002,7 @@ static void iwl3945_enable_interrupts(struct iwl3945_priv *priv)
4002/* call this function to flush any scheduled tasklet */ 4002/* call this function to flush any scheduled tasklet */
4003static inline void iwl_synchronize_irq(struct iwl3945_priv *priv) 4003static inline void iwl_synchronize_irq(struct iwl3945_priv *priv)
4004{ 4004{
4005 /* wait to make sure we flush pedding tasklet*/ 4005 /* wait to make sure we flush pending tasklet*/
4006 synchronize_irq(priv->pci_dev->irq); 4006 synchronize_irq(priv->pci_dev->irq);
4007 tasklet_kill(&priv->irq_tasklet); 4007 tasklet_kill(&priv->irq_tasklet);
4008} 4008}
@@ -5559,7 +5559,7 @@ static int iwl3945_set_ucode_ptrs(struct iwl3945_priv *priv)
5559 iwl3945_write_prph(priv, BSM_DRAM_DATA_BYTECOUNT_REG, 5559 iwl3945_write_prph(priv, BSM_DRAM_DATA_BYTECOUNT_REG,
5560 priv->ucode_data.len); 5560 priv->ucode_data.len);
5561 5561
5562 /* Inst bytecount must be last to set up, bit 31 signals uCode 5562 /* Inst byte count must be last to set up, bit 31 signals uCode
5563 * that all new ptr/size info is in place */ 5563 * that all new ptr/size info is in place */
5564 iwl3945_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG, 5564 iwl3945_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG,
5565 priv->ucode_code.len | BSM_DRAM_INST_LOAD); 5565 priv->ucode_code.len | BSM_DRAM_INST_LOAD);
@@ -5651,7 +5651,7 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
5651 5651
5652 rc = iwl3945_grab_nic_access(priv); 5652 rc = iwl3945_grab_nic_access(priv);
5653 if (rc) { 5653 if (rc) {
5654 IWL_WARNING("Can not read rfkill status from adapter\n"); 5654 IWL_WARNING("Can not read RFKILL status from adapter\n");
5655 return; 5655 return;
5656 } 5656 }
5657 5657
@@ -5661,7 +5661,7 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
5661 5661
5662 if (rfkill & 0x1) { 5662 if (rfkill & 0x1) {
5663 clear_bit(STATUS_RF_KILL_HW, &priv->status); 5663 clear_bit(STATUS_RF_KILL_HW, &priv->status);
5664 /* if rfkill is not on, then wait for thermal 5664 /* if RFKILL is not on, then wait for thermal
5665 * sensor in adapter to kick in */ 5665 * sensor in adapter to kick in */
5666 while (iwl3945_hw_get_temperature(priv) == 0) { 5666 while (iwl3945_hw_get_temperature(priv) == 0) {
5667 thermal_spin++; 5667 thermal_spin++;
@@ -5855,7 +5855,7 @@ static int __iwl3945_up(struct iwl3945_priv *priv)
5855 } 5855 }
5856 5856
5857 if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) { 5857 if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) {
5858 IWL_ERROR("ucode not available for device bringup\n"); 5858 IWL_ERROR("ucode not available for device bring up\n");
5859 return -EIO; 5859 return -EIO;
5860 } 5860 }
5861 5861
@@ -6065,7 +6065,7 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
6065 goto done; 6065 goto done;
6066 } 6066 }
6067 6067
6068 /* Make sure the scan wasn't cancelled before this queued work 6068 /* Make sure the scan wasn't canceled before this queued work
6069 * was given the chance to run... */ 6069 * was given the chance to run... */
6070 if (!test_bit(STATUS_SCANNING, &priv->status)) 6070 if (!test_bit(STATUS_SCANNING, &priv->status))
6071 goto done; 6071 goto done;
@@ -7728,7 +7728,7 @@ static DEVICE_ATTR(dump_events, S_IWUSR, NULL, dump_event_log);
7728 7728
7729/***************************************************************************** 7729/*****************************************************************************
7730 * 7730 *
7731 * driver setup and teardown 7731 * driver setup and tear down
7732 * 7732 *
7733 *****************************************************************************/ 7733 *****************************************************************************/
7734 7734
@@ -8157,7 +8157,7 @@ static int iwl3945_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
8157 if (test_bit(STATUS_EXIT_PENDING, &priv->status)) 8157 if (test_bit(STATUS_EXIT_PENDING, &priv->status))
8158 return 0; 8158 return 0;
8159 8159
8160 IWL_DEBUG_RF_KILL("we recieved soft RFKILL set to state %d\n", state); 8160 IWL_DEBUG_RF_KILL("we received soft RFKILL set to state %d\n", state);
8161 mutex_lock(&priv->mutex); 8161 mutex_lock(&priv->mutex);
8162 8162
8163 switch (state) { 8163 switch (state) {
@@ -8172,7 +8172,7 @@ static int iwl3945_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
8172 iwl3945_radio_kill_sw(priv, 1); 8172 iwl3945_radio_kill_sw(priv, 1);
8173 break; 8173 break;
8174 default: 8174 default:
8175 IWL_WARNING("we recieved unexpected RFKILL state %d\n", state); 8175 IWL_WARNING("we received unexpected RFKILL state %d\n", state);
8176 break; 8176 break;
8177 } 8177 }
8178out_unlock: 8178out_unlock: