aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorIan Schram <ischram@telenet.be>2007-10-25 05:15:22 -0400
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:03:06 -0500
commit01ebd063e11bdcf1ddc605d968ea89aef48e34e0 (patch)
treed7c4046afe2f615f6ddb8f611eee81a3ddad3839 /drivers
parent220173b01266d866009ca075757effad39648529 (diff)
iwlwifi: fix various spelling and typos
Fixing various spelling errors and typos. Mostly in comments. In total 27 words were corrected, some of which occurred more than ones. Signed-Of-By: Ian Schram <ischram@telenet.be> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945-hw.h2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945-rs.c4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945-rs.h4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965-hw.h2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965-rs.c6
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965-rs.h4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-commands.h2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-eeprom.h2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-hw.h2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-prph.h2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c32
-rw-r--r--drivers/net/wireless/iwlwifi/iwl4965-base.c32
-rw-r--r--drivers/net/wireless/iwlwifi/iwlwifi.h6
14 files changed, 52 insertions, 52 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
index fb5f0649f4f6..90d4249fa7f2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
@@ -8,7 +8,7 @@
8 * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved. 8 * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of version 2 of the GNU Geeral Public License as 11 * it under the terms of version 2 of the GNU General Public License as
12 * published by the Free Software Foundation. 12 * published by the Free Software Foundation.
13 * 13 *
14 * This program is distributed in the hope that it will be useful, but 14 * This program is distributed in the hope that it will be useful, but
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index ea7f459e961b..a6cb97ac43ef 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
@@ -362,7 +362,7 @@ static void *rs_alloc(struct ieee80211_local *local)
362 return local->hw.priv; 362 return local->hw.priv;
363} 363}
364 364
365/* rate scale requires free function to be implmented */ 365/* rate scale requires free function to be implemented */
366static void rs_free(void *priv) 366static void rs_free(void *priv)
367{ 367{
368 return; 368 return;
@@ -568,7 +568,7 @@ static u16 iwl_get_adjacent_rate(struct iwl_rate_scale_priv *rs_priv,
568 u8 high = IWL_RATE_INVALID; 568 u8 high = IWL_RATE_INVALID;
569 u8 low = IWL_RATE_INVALID; 569 u8 low = IWL_RATE_INVALID;
570 570
571 /* 802.11A walks to the next literal adjascent rate in 571 /* 802.11A walks to the next literal adjacent rate in
572 * the rate table */ 572 * the rate table */
573 if (unlikely(phymode == MODE_IEEE80211A)) { 573 if (unlikely(phymode == MODE_IEEE80211A)) {
574 int i; 574 int i;
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.h b/drivers/net/wireless/iwlwifi/iwl-3945-rs.h
index bec4d3ffca1d..4f21bc73fc39 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.h
@@ -174,7 +174,7 @@ static inline u8 iwl_get_prev_ieee_rate(u8 rate_index)
174 * iwl_fill_rs_info - Fill an output text buffer with the rate representation 174 * iwl_fill_rs_info - Fill an output text buffer with the rate representation
175 * 175 *
176 * NOTE: This is provided as a quick mechanism for a user to visualize 176 * NOTE: This is provided as a quick mechanism for a user to visualize
177 * the performance of the rate control alogirthm and is not meant to be 177 * the performance of the rate control algorithm and is not meant to be
178 * parsed software. 178 * parsed software.
179 */ 179 */
180extern int iwl_fill_rs_info(struct ieee80211_hw *, char *buf, u8 sta_id); 180extern int iwl_fill_rs_info(struct ieee80211_hw *, char *buf, u8 sta_id);
@@ -182,7 +182,7 @@ extern int iwl_fill_rs_info(struct ieee80211_hw *, char *buf, u8 sta_id);
182/** 182/**
183 * iwl_rate_scale_init - Initialize the rate scale table based on assoc info 183 * iwl_rate_scale_init - Initialize the rate scale table based on assoc info
184 * 184 *
185 * The specific througput table used is based on the type of network 185 * The specific throughput table used is based on the type of network
186 * the associated with, including A, B, G, and G w/ TGG protection 186 * the associated with, including A, B, G, and G w/ TGG protection
187 */ 187 */
188extern void iwl_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id); 188extern void iwl_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id);
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
index 99a19ef4c743..6a2df9d09583 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
@@ -8,7 +8,7 @@
8 * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved. 8 * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of version 2 of the GNU Geeral Public License as 11 * it under the terms of version 2 of the GNU General Public License as
12 * published by the Free Software Foundation. 12 * published by the Free Software Foundation.
13 * 13 *
14 * This program is distributed in the hope that it will be useful, but 14 * This program is distributed in the hope that it will be useful, but
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index 62a3b52b3270..2227ee4ad1af 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@ -498,7 +498,7 @@ static u16 rs_get_adjacent_rate(u8 index, u16 rate_mask, int rate_type)
498 u8 high = IWL_RATE_INVALID; 498 u8 high = IWL_RATE_INVALID;
499 u8 low = IWL_RATE_INVALID; 499 u8 low = IWL_RATE_INVALID;
500 500
501 /* 802.11A or ht walks to the next literal adjascent rate in 501 /* 802.11A or ht walks to the next literal adjacent rate in
502 * the rate table */ 502 * the rate table */
503 if (is_a_band(rate_type) || !is_legacy(rate_type)) { 503 if (is_a_band(rate_type) || !is_legacy(rate_type)) {
504 int i; 504 int i;
@@ -1413,7 +1413,7 @@ static void rs_rate_scale_perform(struct iwl_priv *priv,
1413 index = IWL_INVALID_VALUE; 1413 index = IWL_INVALID_VALUE;
1414 update_lq = 1; 1414 update_lq = 1;
1415 1415
1416 /* get the lowest availabe rate */ 1416 /* get the lowest available rate */
1417 for (i = 0; i <= IWL_RATE_COUNT; i++) { 1417 for (i = 0; i <= IWL_RATE_COUNT; i++) {
1418 if ((1 << i) & rate_scale_index_msk) 1418 if ((1 << i) & rate_scale_index_msk)
1419 index = i; 1419 index = i;
@@ -2245,7 +2245,7 @@ int iwl_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)
2245 max_time, good * 100 / samples, good, samples); 2245 max_time, good * 100 / samples, good, samples);
2246 else 2246 else
2247 count += sprintf(&buf[count], "\nAverage rate: 0Mbs\n"); 2247 count += sprintf(&buf[count], "\nAverage rate: 0Mbs\n");
2248 count += sprintf(&buf[count], "\nrate scale type %d anntena %d " 2248 count += sprintf(&buf[count], "\nrate scale type %d antenna %d "
2249 "active_search %d rate index %d\n", lq_type, antenna, 2249 "active_search %d rate index %d\n", lq_type, antenna,
2250 rs_priv->search_better_tbl, sta->last_txrate); 2250 rs_priv->search_better_tbl, sta->last_txrate);
2251 2251
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.h b/drivers/net/wireless/iwlwifi/iwl-4965-rs.h
index c6325f72df68..f735752abf30 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.h
@@ -230,7 +230,7 @@ extern int iwl_rate_index_from_plcp(int plcp);
230 * iwl_fill_rs_info - Fill an output text buffer with the rate representation 230 * iwl_fill_rs_info - Fill an output text buffer with the rate representation
231 * 231 *
232 * NOTE: This is provided as a quick mechanism for a user to visualize 232 * NOTE: This is provided as a quick mechanism for a user to visualize
233 * the performance of the rate control alogirthm and is not meant to be 233 * the performance of the rate control algorithm and is not meant to be
234 * parsed software. 234 * parsed software.
235 */ 235 */
236extern int iwl_fill_rs_info(struct ieee80211_hw *, char *buf, u8 sta_id); 236extern int iwl_fill_rs_info(struct ieee80211_hw *, char *buf, u8 sta_id);
@@ -238,7 +238,7 @@ extern int iwl_fill_rs_info(struct ieee80211_hw *, char *buf, u8 sta_id);
238/** 238/**
239 * iwl_rate_scale_init - Initialize the rate scale table based on assoc info 239 * iwl_rate_scale_init - Initialize the rate scale table based on assoc info
240 * 240 *
241 * The specific througput table used is based on the type of network 241 * The specific throughput table used is based on the type of network
242 * the associated with, including A, B, G, and G w/ TGG protection 242 * the associated with, including A, B, G, and G w/ TGG protection
243 */ 243 */
244extern void iwl_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id); 244extern void iwl_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id);
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 891f90d2f019..02708c7ee51c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -4051,7 +4051,7 @@ static int iwl4965_tx_status_reply_compressed_ba(struct iwl_priv *priv,
4051 agg->wait_for_ba = 0; 4051 agg->wait_for_ba = 0;
4052 IWL_DEBUG_TX_REPLY("BA %d %d\n", agg->start_idx, ba_resp->ba_seq_ctl); 4052 IWL_DEBUG_TX_REPLY("BA %d %d\n", agg->start_idx, ba_resp->ba_seq_ctl);
4053 sh = agg->start_idx - SEQ_TO_INDEX(ba_seq_ctl>>4); 4053 sh = agg->start_idx - SEQ_TO_INDEX(ba_seq_ctl>>4);
4054 if (sh < 0) /* tbw something is wrong with indeces */ 4054 if (sh < 0) /* tbw something is wrong with indices */
4055 sh += 0x100; 4055 sh += 0x100;
4056 4056
4057 /* don't use 64 bits for now */ 4057 /* don't use 64 bits for now */
@@ -4109,7 +4109,7 @@ static void iwl4965_rx_reply_compressed_ba(struct iwl_priv *priv,
4109 agg = &priv->stations[ba_resp->sta_id].tid[ba_resp->tid].agg; 4109 agg = &priv->stations[ba_resp->sta_id].tid[ba_resp->tid].agg;
4110 index = iwl_queue_dec_wrap(ba_resp_scd_ssn & 0xff, txq->q.n_bd); 4110 index = iwl_queue_dec_wrap(ba_resp_scd_ssn & 0xff, txq->q.n_bd);
4111 4111
4112 /* TODO: Need to get this copy more sefely - now good for debug */ 4112 /* TODO: Need to get this copy more safely - now good for debug */
4113/* 4113/*
4114 { 4114 {
4115 DECLARE_MAC_BUF(mac); 4115 DECLARE_MAC_BUF(mac);
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index 9de8d7f6efa3..d852a77d112e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -8,7 +8,7 @@
8 * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved. 8 * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of version 2 of the GNU Geeral Public License as 11 * it under the terms of version 2 of the GNU General Public License as
12 * published by the Free Software Foundation. 12 * published by the Free Software Foundation.
13 * 13 *
14 * This program is distributed in the hope that it will be useful, but 14 * This program is distributed in the hope that it will be useful, but
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
index e473c97e3f4f..22cbe278add1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
@@ -8,7 +8,7 @@
8 * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved. 8 * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of version 2 of the GNU Geeral Public License as 11 * it under the terms of version 2 of the GNU General Public License as
12 * published by the Free Software Foundation. 12 * published by the Free Software Foundation.
13 * 13 *
14 * This program is distributed in the hope that it will be useful, but 14 * This program is distributed in the hope that it will be useful, but
diff --git a/drivers/net/wireless/iwlwifi/iwl-hw.h b/drivers/net/wireless/iwlwifi/iwl-hw.h
index 1aa6fcd39a5e..8968a95352d9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-hw.h
@@ -8,7 +8,7 @@
8 * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved. 8 * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of version 2 of the GNU Geeral Public License as 11 * it under the terms of version 2 of the GNU General Public License as
12 * published by the Free Software Foundation. 12 * published by the Free Software Foundation.
13 * 13 *
14 * This program is distributed in the hope that it will be useful, but 14 * This program is distributed in the hope that it will be useful, but
diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h
index 0df41148eadc..b1b5233bafc5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
@@ -8,7 +8,7 @@
8 * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved. 8 * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of version 2 of the GNU Geeral Public License as 11 * it under the terms of version 2 of the GNU General Public License as
12 * published by the Free Software Foundation. 12 * published by the Free Software Foundation.
13 * 13 *
14 * This program is distributed in the hope that it will be useful, but 14 * This program is distributed in the hope that it will be useful, but
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 0b3ec7e4d93b..60e25464cee4 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -287,7 +287,7 @@ static int iwl_tx_queue_alloc(struct iwl_priv *priv,
287 txq->txb = kmalloc(sizeof(txq->txb[0]) * 287 txq->txb = kmalloc(sizeof(txq->txb[0]) *
288 TFD_QUEUE_SIZE_MAX, GFP_KERNEL); 288 TFD_QUEUE_SIZE_MAX, GFP_KERNEL);
289 if (!txq->txb) { 289 if (!txq->txb) {
290 IWL_ERROR("kmalloc for auxilary BD " 290 IWL_ERROR("kmalloc for auxiliary BD "
291 "structures failed\n"); 291 "structures failed\n");
292 goto error; 292 goto error;
293 } 293 }
@@ -323,7 +323,7 @@ int iwl_tx_queue_init(struct iwl_priv *priv,
323 int len; 323 int len;
324 int rc = 0; 324 int rc = 0;
325 325
326 /* alocate command space + one big command for scan since scan 326 /* allocate command space + one big command for scan since scan
327 * command is very huge the system will not have two scan at the 327 * command is very huge the system will not have two scan at the
328 * same time */ 328 * same time */
329 len = sizeof(struct iwl_cmd) * slots_num; 329 len = sizeof(struct iwl_cmd) * slots_num;
@@ -405,7 +405,7 @@ const u8 BROADCAST_ADDR[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
405 */ 405 */
406 406
407/**************************************************************/ 407/**************************************************************/
408#if 0 /* temparary disable till we add real remove station */ 408#if 0 /* temporary disable till we add real remove station */
409static u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap) 409static u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
410{ 410{
411 int index = IWL_INVALID_STATION; 411 int index = IWL_INVALID_STATION;
@@ -482,7 +482,7 @@ u8 iwl_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap, u8 flags)
482 index = i; 482 index = i;
483 } 483 }
484 484
485 /* These twh conditions has the same outcome but keep them separate 485 /* These two conditions has the same outcome but keep them separate
486 since they have different meaning */ 486 since they have different meaning */
487 if (unlikely(index == IWL_INVALID_STATION)) { 487 if (unlikely(index == IWL_INVALID_STATION)) {
488 spin_unlock_irqrestore(&priv->sta_lock, flags_spin); 488 spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
@@ -959,7 +959,7 @@ static int iwl_check_rxon_cmd(struct iwl_rxon_cmd *rxon)
959 959
960/** 960/**
961 * iwl_full_rxon_required - determine if RXON_ASSOC can be used in RXON commit 961 * iwl_full_rxon_required - determine if RXON_ASSOC can be used in RXON commit
962 * @priv: staging_rxon is comapred to active_rxon 962 * @priv: staging_rxon is compared to active_rxon
963 * 963 *
964 * If the RXON structure is changing sufficient to require a new 964 * If the RXON structure is changing sufficient to require a new
965 * tune or to clear and reset the RXON_FILTER_ASSOC_MSK then return 1 965 * tune or to clear and reset the RXON_FILTER_ASSOC_MSK then return 1
@@ -1047,7 +1047,7 @@ static int iwl_send_rxon_assoc(struct iwl_priv *priv)
1047/** 1047/**
1048 * iwl_commit_rxon - commit staging_rxon to hardware 1048 * iwl_commit_rxon - commit staging_rxon to hardware
1049 * 1049 *
1050 * The RXON command in staging_rxon is commited to the hardware and 1050 * The RXON command in staging_rxon is committed to the hardware and
1051 * the active_rxon structure is updated with the new data. This 1051 * the active_rxon structure is updated with the new data. This
1052 * function correctly transitions out of the RXON_ASSOC_MSK state if 1052 * function correctly transitions out of the RXON_ASSOC_MSK state if
1053 * a HW tune is required based on the RXON structure changes. 1053 * a HW tune is required based on the RXON structure changes.
@@ -2150,7 +2150,7 @@ static int iwl_send_power_mode(struct iwl_priv *priv, u32 mode)
2150 struct iwl_powertable_cmd cmd; 2150 struct iwl_powertable_cmd cmd;
2151 2151
2152 /* If on battery, set to 3, 2152 /* If on battery, set to 3,
2153 * if plugged into AC power, set to CAM ("continuosly aware mode"), 2153 * if plugged into AC power, set to CAM ("continuously aware mode"),
2154 * else user level */ 2154 * else user level */
2155 switch (mode) { 2155 switch (mode) {
2156 case IWL_POWER_BATTERY: 2156 case IWL_POWER_BATTERY:
@@ -2440,7 +2440,7 @@ static void iwl_set_flags_for_phymode(struct iwl_priv *priv, u8 phymode)
2440} 2440}
2441 2441
2442/* 2442/*
2443 * initilize rxon structure with default values fromm eeprom 2443 * initialize rxon structure with default values from eeprom
2444 */ 2444 */
2445static void iwl_connection_init_rx_config(struct iwl_priv *priv) 2445static void iwl_connection_init_rx_config(struct iwl_priv *priv)
2446{ 2446{
@@ -2704,7 +2704,7 @@ static int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
2704 return priv->hw_setting.bcast_sta_id; 2704 return priv->hw_setting.bcast_sta_id;
2705 } 2705 }
2706 default: 2706 default:
2707 IWL_WARNING("Unkown mode of operation: %d", priv->iw_mode); 2707 IWL_WARNING("Unknown mode of operation: %d", priv->iw_mode);
2708 return priv->hw_setting.bcast_sta_id; 2708 return priv->hw_setting.bcast_sta_id;
2709 } 2709 }
2710} 2710}
@@ -3890,7 +3890,7 @@ static void iwl_tx_cmd_complete(struct iwl_priv *priv,
3890 * The management in the driver is as follows: 3890 * The management in the driver is as follows:
3891 * + A list of pre-allocated SKBs is stored in iwl->rxq->rx_free. When 3891 * + A list of pre-allocated SKBs is stored in iwl->rxq->rx_free. When
3892 * iwl->rxq->free_count drops to or below RX_LOW_WATERMARK, work is scheduled 3892 * iwl->rxq->free_count drops to or below RX_LOW_WATERMARK, work is scheduled
3893 * to replensish the iwl->rxq->rx_free. 3893 * to replenish the iwl->rxq->rx_free.
3894 * + In iwl_rx_replenish (scheduled) if 'processed' != 'read' then the 3894 * + In iwl_rx_replenish (scheduled) if 'processed' != 'read' then the
3895 * iwl->rxq is replenished and the READ INDEX is updated (updating the 3895 * iwl->rxq is replenished and the READ INDEX is updated (updating the
3896 * 'processed' and 'read' driver indexes as well) 3896 * 'processed' and 'read' driver indexes as well)
@@ -4047,12 +4047,12 @@ int iwl_rx_queue_restock(struct iwl_priv *priv)
4047} 4047}
4048 4048
4049/** 4049/**
4050 * iwl_rx_replensih - Move all used packet from rx_used to rx_free 4050 * iwl_rx_replenish - Move all used packet from rx_used to rx_free
4051 * 4051 *
4052 * When moving to rx_free an SKB is allocated for the slot. 4052 * When moving to rx_free an SKB is allocated for the slot.
4053 * 4053 *
4054 * Also restock the Rx queue via iwl_rx_queue_restock. 4054 * Also restock the Rx queue via iwl_rx_queue_restock.
4055 * This is called as a scheduled work item (except for during intialization) 4055 * This is called as a scheduled work item (except for during initialization)
4056 */ 4056 */
4057void iwl_rx_replenish(void *data) 4057void iwl_rx_replenish(void *data)
4058{ 4058{
@@ -6042,7 +6042,7 @@ static int iwl_set_ucode_ptrs(struct iwl_priv *priv)
6042} 6042}
6043 6043
6044/** 6044/**
6045 * iwl_init_alive_start - Called after REPLY_ALIVE notification receieved 6045 * iwl_init_alive_start - Called after REPLY_ALIVE notification received
6046 * 6046 *
6047 * Called after REPLY_ALIVE notification received from "initialize" uCode. 6047 * Called after REPLY_ALIVE notification received from "initialize" uCode.
6048 * 6048 *
@@ -6693,7 +6693,7 @@ static void iwl_bg_request_scan(struct work_struct *data)
6693 return; 6693 return;
6694 6694
6695 done: 6695 done:
6696 /* inform mac80211 sacn aborted */ 6696 /* inform mac80211 scan aborted */
6697 queue_work(priv->workqueue, &priv->scan_completed); 6697 queue_work(priv->workqueue, &priv->scan_completed);
6698 mutex_unlock(&priv->mutex); 6698 mutex_unlock(&priv->mutex);
6699} 6699}
@@ -6997,7 +6997,7 @@ static int iwl_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
6997 } 6997 }
6998 6998
6999 /* TODO: Figure out how to get ieee80211_local->sta_scanning w/ only 6999 /* TODO: Figure out how to get ieee80211_local->sta_scanning w/ only
7000 * what is exposed through include/ declrations */ 7000 * what is exposed through include/ declarations */
7001 if (unlikely(!iwl_param_disable_hw_scan && 7001 if (unlikely(!iwl_param_disable_hw_scan &&
7002 test_bit(STATUS_SCANNING, &priv->status))) { 7002 test_bit(STATUS_SCANNING, &priv->status))) {
7003 IWL_DEBUG_MAC80211("leave - scanning\n"); 7003 IWL_DEBUG_MAC80211("leave - scanning\n");
@@ -8541,7 +8541,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
8541 8541
8542 mutex_unlock(&priv->mutex); 8542 mutex_unlock(&priv->mutex);
8543 8543
8544 IWL_DEBUG_INFO("Queing UP work.\n"); 8544 IWL_DEBUG_INFO("Queueing UP work.\n");
8545 8545
8546 queue_work(priv->workqueue, &priv->up); 8546 queue_work(priv->workqueue, &priv->up);
8547 8547
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 35ebe2b89765..1fe05402080c 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -286,7 +286,7 @@ static int iwl_tx_queue_alloc(struct iwl_priv *priv,
286 txq->txb = kmalloc(sizeof(txq->txb[0]) * 286 txq->txb = kmalloc(sizeof(txq->txb[0]) *
287 TFD_QUEUE_SIZE_MAX, GFP_KERNEL); 287 TFD_QUEUE_SIZE_MAX, GFP_KERNEL);
288 if (!txq->txb) { 288 if (!txq->txb) {
289 IWL_ERROR("kmalloc for auxilary BD " 289 IWL_ERROR("kmalloc for auxiliary BD "
290 "structures failed\n"); 290 "structures failed\n");
291 goto error; 291 goto error;
292 } 292 }
@@ -322,7 +322,7 @@ int iwl_tx_queue_init(struct iwl_priv *priv,
322 int len; 322 int len;
323 int rc = 0; 323 int rc = 0;
324 324
325 /* alocate command space + one big command for scan since scan 325 /* allocate command space + one big command for scan since scan
326 * command is very huge the system will not have two scan at the 326 * command is very huge the system will not have two scan at the
327 * same time */ 327 * same time */
328 len = sizeof(struct iwl_cmd) * slots_num; 328 len = sizeof(struct iwl_cmd) * slots_num;
@@ -405,7 +405,7 @@ const u8 BROADCAST_ADDR[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
405 405
406/**************************************************************/ 406/**************************************************************/
407 407
408#if 0 /* temparary disable till we add real remove station */ 408#if 0 /* temporary disable till we add real remove station */
409static u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap) 409static u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
410{ 410{
411 int index = IWL_INVALID_STATION; 411 int index = IWL_INVALID_STATION;
@@ -482,7 +482,7 @@ u8 iwl_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap, u8 flags)
482 } 482 }
483 483
484 484
485 /* These twh conditions has the same outcome but keep them separate 485 /* These two conditions has the same outcome but keep them separate
486 since they have different meaning */ 486 since they have different meaning */
487 if (unlikely(index == IWL_INVALID_STATION)) { 487 if (unlikely(index == IWL_INVALID_STATION)) {
488 spin_unlock_irqrestore(&priv->sta_lock, flags_spin); 488 spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
@@ -970,7 +970,7 @@ static int iwl_check_rxon_cmd(struct iwl_rxon_cmd *rxon)
970 970
971/** 971/**
972 * iwl_full_rxon_required - determine if RXON_ASSOC can be used in RXON commit 972 * iwl_full_rxon_required - determine if RXON_ASSOC can be used in RXON commit
973 * @priv: staging_rxon is comapred to active_rxon 973 * @priv: staging_rxon is compared to active_rxon
974 * 974 *
975 * If the RXON structure is changing sufficient to require a new 975 * If the RXON structure is changing sufficient to require a new
976 * tune or to clear and reset the RXON_FILTER_ASSOC_MSK then return 1 976 * tune or to clear and reset the RXON_FILTER_ASSOC_MSK then return 1
@@ -1073,7 +1073,7 @@ static int iwl_send_rxon_assoc(struct iwl_priv *priv)
1073/** 1073/**
1074 * iwl_commit_rxon - commit staging_rxon to hardware 1074 * iwl_commit_rxon - commit staging_rxon to hardware
1075 * 1075 *
1076 * The RXON command in staging_rxon is commited to the hardware and 1076 * The RXON command in staging_rxon is committed to the hardware and
1077 * the active_rxon structure is updated with the new data. This 1077 * the active_rxon structure is updated with the new data. This
1078 * function correctly transitions out of the RXON_ASSOC_MSK state if 1078 * function correctly transitions out of the RXON_ASSOC_MSK state if
1079 * a HW tune is required based on the RXON structure changes. 1079 * a HW tune is required based on the RXON structure changes.
@@ -2224,7 +2224,7 @@ static int iwl_send_power_mode(struct iwl_priv *priv, u32 mode)
2224 struct iwl_powertable_cmd cmd; 2224 struct iwl_powertable_cmd cmd;
2225 2225
2226 /* If on battery, set to 3, 2226 /* If on battery, set to 3,
2227 * if plugged into AC power, set to CAM ("continuosly aware mode"), 2227 * if plugged into AC power, set to CAM ("continuously aware mode"),
2228 * else user level */ 2228 * else user level */
2229 switch (mode) { 2229 switch (mode) {
2230 case IWL_POWER_BATTERY: 2230 case IWL_POWER_BATTERY:
@@ -2516,7 +2516,7 @@ static void iwl_set_flags_for_phymode(struct iwl_priv *priv, u8 phymode)
2516} 2516}
2517 2517
2518/* 2518/*
2519 * initilize rxon structure with default values fromm eeprom 2519 * initialize rxon structure with default values from eeprom
2520 */ 2520 */
2521static void iwl_connection_init_rx_config(struct iwl_priv *priv) 2521static void iwl_connection_init_rx_config(struct iwl_priv *priv)
2522{ 2522{
@@ -2787,7 +2787,7 @@ static int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
2787 return priv->hw_setting.bcast_sta_id; 2787 return priv->hw_setting.bcast_sta_id;
2788 2788
2789 default: 2789 default:
2790 IWL_WARNING("Unkown mode of operation: %d", priv->iw_mode); 2790 IWL_WARNING("Unknown mode of operation: %d", priv->iw_mode);
2791 return priv->hw_setting.bcast_sta_id; 2791 return priv->hw_setting.bcast_sta_id;
2792 } 2792 }
2793} 2793}
@@ -4210,7 +4210,7 @@ static void iwl_tx_cmd_complete(struct iwl_priv *priv,
4210 * The management in the driver is as follows: 4210 * The management in the driver is as follows:
4211 * + A list of pre-allocated SKBs is stored in iwl->rxq->rx_free. When 4211 * + A list of pre-allocated SKBs is stored in iwl->rxq->rx_free. When
4212 * iwl->rxq->free_count drops to or below RX_LOW_WATERMARK, work is scheduled 4212 * iwl->rxq->free_count drops to or below RX_LOW_WATERMARK, work is scheduled
4213 * to replensish the iwl->rxq->rx_free. 4213 * to replenish the iwl->rxq->rx_free.
4214 * + In iwl_rx_replenish (scheduled) if 'processed' != 'read' then the 4214 * + In iwl_rx_replenish (scheduled) if 'processed' != 'read' then the
4215 * iwl->rxq is replenished and the READ INDEX is updated (updating the 4215 * iwl->rxq is replenished and the READ INDEX is updated (updating the
4216 * 'processed' and 'read' driver indexes as well) 4216 * 'processed' and 'read' driver indexes as well)
@@ -4368,12 +4368,12 @@ int iwl_rx_queue_restock(struct iwl_priv *priv)
4368} 4368}
4369 4369
4370/** 4370/**
4371 * iwl_rx_replensih - Move all used packet from rx_used to rx_free 4371 * iwl_rx_replenish - Move all used packet from rx_used to rx_free
4372 * 4372 *
4373 * When moving to rx_free an SKB is allocated for the slot. 4373 * When moving to rx_free an SKB is allocated for the slot.
4374 * 4374 *
4375 * Also restock the Rx queue via iwl_rx_queue_restock. 4375 * Also restock the Rx queue via iwl_rx_queue_restock.
4376 * This is called as a scheduled work item (except for during intialization) 4376 * This is called as a scheduled work item (except for during initialization)
4377 */ 4377 */
4378void iwl_rx_replenish(void *data) 4378void iwl_rx_replenish(void *data)
4379{ 4379{
@@ -6415,7 +6415,7 @@ static int iwl_set_ucode_ptrs(struct iwl_priv *priv)
6415} 6415}
6416 6416
6417/** 6417/**
6418 * iwl_init_alive_start - Called after REPLY_ALIVE notification receieved 6418 * iwl_init_alive_start - Called after REPLY_ALIVE notification received
6419 * 6419 *
6420 * Called after REPLY_ALIVE notification received from "initialize" uCode. 6420 * Called after REPLY_ALIVE notification received from "initialize" uCode.
6421 * 6421 *
@@ -7068,7 +7068,7 @@ static void iwl_bg_request_scan(struct work_struct *data)
7068 return; 7068 return;
7069 7069
7070 done: 7070 done:
7071 /* inform mac80211 sacn aborted */ 7071 /* inform mac80211 scan aborted */
7072 queue_work(priv->workqueue, &priv->scan_completed); 7072 queue_work(priv->workqueue, &priv->scan_completed);
7073 mutex_unlock(&priv->mutex); 7073 mutex_unlock(&priv->mutex);
7074} 7074}
@@ -7386,7 +7386,7 @@ static int iwl_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
7386 } 7386 }
7387 7387
7388 /* TODO: Figure out how to get ieee80211_local->sta_scanning w/ only 7388 /* TODO: Figure out how to get ieee80211_local->sta_scanning w/ only
7389 * what is exposed through include/ declrations */ 7389 * what is exposed through include/ declarations */
7390 if (unlikely(!iwl_param_disable_hw_scan && 7390 if (unlikely(!iwl_param_disable_hw_scan &&
7391 test_bit(STATUS_SCANNING, &priv->status))) { 7391 test_bit(STATUS_SCANNING, &priv->status))) {
7392 IWL_DEBUG_MAC80211("leave - scanning\n"); 7392 IWL_DEBUG_MAC80211("leave - scanning\n");
@@ -9159,7 +9159,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
9159 9159
9160 mutex_unlock(&priv->mutex); 9160 mutex_unlock(&priv->mutex);
9161 9161
9162 IWL_DEBUG_INFO("Queing UP work.\n"); 9162 IWL_DEBUG_INFO("Queueing UP work.\n");
9163 9163
9164 queue_work(priv->workqueue, &priv->up); 9164 queue_work(priv->workqueue, &priv->up);
9165 9165
diff --git a/drivers/net/wireless/iwlwifi/iwlwifi.h b/drivers/net/wireless/iwlwifi/iwlwifi.h
index 432ce887807f..8e52fef94916 100644
--- a/drivers/net/wireless/iwlwifi/iwlwifi.h
+++ b/drivers/net/wireless/iwlwifi/iwlwifi.h
@@ -54,9 +54,9 @@ extern struct pci_device_id iwl_hw_card_ids[];
54 * Driver implementation data structures, constants, inline 54 * Driver implementation data structures, constants, inline
55 * functions 55 * functions
56 * 56 *
57 * NOTE: DO NOT PUT HARDWARE/UCODE SPECIFIC DECLRATIONS HERE 57 * NOTE: DO NOT PUT HARDWARE/UCODE SPECIFIC DECLARATIONS HERE
58 * 58 *
59 * Hardware specific declrations go into iwl-*hw.h 59 * Hardware specific declarations go into iwl-*hw.h
60 * 60 *
61 */ 61 */
62 62
@@ -467,7 +467,7 @@ union iwl_qos_capabity {
467 u8 val; 467 u8 val;
468}; 468};
469 469
470/* QoS sturctures */ 470/* QoS structures */
471struct iwl_qos_info { 471struct iwl_qos_info {
472 int qos_enable; 472 int qos_enable;
473 int qos_active; 473 int qos_active;