aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2011-08-16 08:17:04 -0400
committerStanislaw Gruszka <sgruszka@redhat.com>2011-11-15 05:17:04 -0500
commitd2ddf621aa45ac4cf4cce6359bfac6b49a8c6b34 (patch)
tree94ed27d88f2f922e0367470d5a02720b3727e066 /drivers
parent46bc8d4b0e73ac75de323646d75a2333f47b84c3 (diff)
iwlegacy: rename iwlegacy to il
More renaming to make code shorter. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-lib.c2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-rs.c20
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-sta.c4
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-tx.c2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-core.c18
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-debug.h2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-debugfs.c4
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-dev.h8
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-eeprom.c54
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-eeprom.h2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-legacy-rs.h4
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-scan.c4
-rw-r--r--drivers/net/wireless/iwlegacy/iwl3945-base.c4
-rw-r--r--drivers/net/wireless/iwlegacy/iwl4965-base.c6
14 files changed, 67 insertions, 67 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c b/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
index 4d25590b0339..647399ed0a0c 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
@@ -424,7 +424,7 @@ int il4965_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band)
424 if (band == IEEE80211_BAND_5GHZ) 424 if (band == IEEE80211_BAND_5GHZ)
425 band_offset = IL_FIRST_OFDM_RATE; 425 band_offset = IL_FIRST_OFDM_RATE;
426 for (idx = band_offset; idx < IL_RATE_COUNT_LEGACY; idx++) 426 for (idx = band_offset; idx < IL_RATE_COUNT_LEGACY; idx++)
427 if (iwlegacy_rates[idx].plcp == (rate_n_flags & 0xFF)) 427 if (il_rates[idx].plcp == (rate_n_flags & 0xFF))
428 return idx - band_offset; 428 return idx - band_offset;
429 } 429 }
430 430
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c b/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
index e53ed1a5d5db..60ff0cdff9c0 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
@@ -96,7 +96,7 @@ static const u8 ant_toggle_lookup[] = {
96 * maps to IL_RATE_INVALID 96 * maps to IL_RATE_INVALID
97 * 97 *
98 */ 98 */
99const struct il_rate_info iwlegacy_rates[IL_RATE_COUNT] = { 99const struct il_rate_info il_rates[IL_RATE_COUNT] = {
100 IL_DECLARE_RATE_INFO(1, INV, INV, 2, INV, 2, INV, 2), /* 1mbps */ 100 IL_DECLARE_RATE_INFO(1, INV, INV, 2, INV, 2, INV, 2), /* 1mbps */
101 IL_DECLARE_RATE_INFO(2, INV, 1, 5, 1, 5, 1, 5), /* 2mbps */ 101 IL_DECLARE_RATE_INFO(2, INV, 1, 5, 1, 5, 1, 5), /* 2mbps */
102 IL_DECLARE_RATE_INFO(5, INV, 2, 6, 2, 11, 2, 11), /*5.5mbps */ 102 IL_DECLARE_RATE_INFO(5, INV, 2, 6, 2, 11, 2, 11), /*5.5mbps */
@@ -132,8 +132,8 @@ static int il4965_hwrate_to_plcp_idx(u32 rate_n_flags)
132 132
133 /* legacy rate format, search for match in table */ 133 /* legacy rate format, search for match in table */
134 } else { 134 } else {
135 for (idx = 0; idx < ARRAY_SIZE(iwlegacy_rates); idx++) 135 for (idx = 0; idx < ARRAY_SIZE(il_rates); idx++)
136 if (iwlegacy_rates[idx].plcp == (rate_n_flags & 0xFF)) 136 if (il_rates[idx].plcp == (rate_n_flags & 0xFF))
137 return idx; 137 return idx;
138 } 138 }
139 139
@@ -499,7 +499,7 @@ static u32 il4965_rate_n_flags_from_tbl(struct il_priv *il,
499 u32 rate_n_flags = 0; 499 u32 rate_n_flags = 0;
500 500
501 if (is_legacy(tbl->lq_type)) { 501 if (is_legacy(tbl->lq_type)) {
502 rate_n_flags = iwlegacy_rates[index].plcp; 502 rate_n_flags = il_rates[index].plcp;
503 if (index >= IL_FIRST_CCK_RATE && index <= IL_LAST_CCK_RATE) 503 if (index >= IL_FIRST_CCK_RATE && index <= IL_LAST_CCK_RATE)
504 rate_n_flags |= RATE_MCS_CCK_MSK; 504 rate_n_flags |= RATE_MCS_CCK_MSK;
505 505
@@ -511,9 +511,9 @@ static u32 il4965_rate_n_flags_from_tbl(struct il_priv *il,
511 rate_n_flags = RATE_MCS_HT_MSK; 511 rate_n_flags = RATE_MCS_HT_MSK;
512 512
513 if (is_siso(tbl->lq_type)) 513 if (is_siso(tbl->lq_type))
514 rate_n_flags |= iwlegacy_rates[index].plcp_siso; 514 rate_n_flags |= il_rates[index].plcp_siso;
515 else 515 else
516 rate_n_flags |= iwlegacy_rates[index].plcp_mimo2; 516 rate_n_flags |= il_rates[index].plcp_mimo2;
517 } else { 517 } else {
518 IL_ERR(il, "Invalid tbl->lq_type %d\n", tbl->lq_type); 518 IL_ERR(il, "Invalid tbl->lq_type %d\n", tbl->lq_type);
519 } 519 }
@@ -702,7 +702,7 @@ il4965_rs_get_adjacent_rate(struct il_priv *il, u8 index, u16 rate_mask,
702 702
703 low = index; 703 low = index;
704 while (low != IL_RATE_INVALID) { 704 while (low != IL_RATE_INVALID) {
705 low = iwlegacy_rates[low].prev_rs; 705 low = il_rates[low].prev_rs;
706 if (low == IL_RATE_INVALID) 706 if (low == IL_RATE_INVALID)
707 break; 707 break;
708 if (rate_mask & (1 << low)) 708 if (rate_mask & (1 << low))
@@ -712,7 +712,7 @@ il4965_rs_get_adjacent_rate(struct il_priv *il, u8 index, u16 rate_mask,
712 712
713 high = index; 713 high = index;
714 while (high != IL_RATE_INVALID) { 714 while (high != IL_RATE_INVALID) {
715 high = iwlegacy_rates[high].next_rs; 715 high = il_rates[high].next_rs;
716 if (high == IL_RATE_INVALID) 716 if (high == IL_RATE_INVALID)
717 break; 717 break;
718 if (rate_mask & (1 << high)) 718 if (rate_mask & (1 << high))
@@ -2220,7 +2220,7 @@ static void il4965_rs_initialize_lq(struct il_priv *il,
2220 if ((i < 0) || (i >= IL_RATE_COUNT)) 2220 if ((i < 0) || (i >= IL_RATE_COUNT))
2221 i = 0; 2221 i = 0;
2222 2222
2223 rate = iwlegacy_rates[i].plcp; 2223 rate = il_rates[i].plcp;
2224 tbl->ant_type = il4965_first_antenna(valid_tx_ant); 2224 tbl->ant_type = il4965_first_antenna(valid_tx_ant);
2225 rate |= tbl->ant_type << RATE_MCS_ANT_POS; 2225 rate |= tbl->ant_type << RATE_MCS_ANT_POS;
2226 2226
@@ -2793,7 +2793,7 @@ static ssize_t il4965_rs_sta_dbgfs_rate_scale_data_read(struct file *file,
2793 else 2793 else
2794 desc += sprintf(buff+desc, 2794 desc += sprintf(buff+desc,
2795 "Bit Rate= %d Mb/s\n", 2795 "Bit Rate= %d Mb/s\n",
2796 iwlegacy_rates[lq_sta->last_txrate_idx].ieee >> 1); 2796 il_rates[lq_sta->last_txrate_idx].ieee >> 1);
2797 2797
2798 ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc); 2798 ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);
2799 return ret; 2799 return ret;
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-sta.c b/drivers/net/wireless/iwlegacy/iwl-4965-sta.c
index 20290d24fd62..0fbc991fe66c 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-sta.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-sta.c
@@ -59,7 +59,7 @@ il4965_sta_alloc_lq(struct il_priv *il, u8 sta_id)
59 59
60 rate_flags |= il4965_first_antenna(il->hw_params.valid_tx_ant) << 60 rate_flags |= il4965_first_antenna(il->hw_params.valid_tx_ant) <<
61 RATE_MCS_ANT_POS; 61 RATE_MCS_ANT_POS;
62 rate_n_flags = il4965_hw_set_rate_n_flags(iwlegacy_rates[r].plcp, 62 rate_n_flags = il4965_hw_set_rate_n_flags(il_rates[r].plcp,
63 rate_flags); 63 rate_flags);
64 for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++) 64 for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)
65 link_cmd->rs_table[i].rate_n_flags = rate_n_flags; 65 link_cmd->rs_table[i].rate_n_flags = rate_n_flags;
@@ -554,7 +554,7 @@ int il4965_alloc_bcast_station(struct il_priv *il,
554 u8 sta_id; 554 u8 sta_id;
555 555
556 spin_lock_irqsave(&il->sta_lock, flags); 556 spin_lock_irqsave(&il->sta_lock, flags);
557 sta_id = il_prep_station(il, ctx, iwlegacy_bcast_addr, 557 sta_id = il_prep_station(il, ctx, il_bcast_addr,
558 false, NULL); 558 false, NULL);
559 if (sta_id == IL_INVALID_STATION) { 559 if (sta_id == IL_INVALID_STATION) {
560 IL_ERR(il, "Unable to prepare broadcast station\n"); 560 IL_ERR(il, "Unable to prepare broadcast station\n");
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-tx.c b/drivers/net/wireless/iwlegacy/iwl-4965-tx.c
index 59d737496b5c..fcc938e1cf6c 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-tx.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-tx.c
@@ -203,7 +203,7 @@ static void il4965_tx_cmd_build_rate(struct il_priv *il,
203 if (info->band == IEEE80211_BAND_5GHZ) 203 if (info->band == IEEE80211_BAND_5GHZ)
204 rate_idx += IL_FIRST_OFDM_RATE; 204 rate_idx += IL_FIRST_OFDM_RATE;
205 /* Get PLCP rate for tx_cmd->rate_n_flags */ 205 /* Get PLCP rate for tx_cmd->rate_n_flags */
206 rate_plcp = iwlegacy_rates[rate_idx].plcp; 206 rate_plcp = il_rates[rate_idx].plcp;
207 /* Zero out flags for this packet */ 207 /* Zero out flags for this packet */
208 rate_flags = 0; 208 rate_flags = 0;
209 209
diff --git a/drivers/net/wireless/iwlegacy/iwl-core.c b/drivers/net/wireless/iwlegacy/iwl-core.c
index 80ec543dd894..a768e78bf897 100644
--- a/drivers/net/wireless/iwlegacy/iwl-core.c
+++ b/drivers/net/wireless/iwlegacy/iwl-core.c
@@ -68,11 +68,11 @@ static bool bt_coex_active = true;
68module_param(bt_coex_active, bool, S_IRUGO); 68module_param(bt_coex_active, bool, S_IRUGO);
69MODULE_PARM_DESC(bt_coex_active, "enable wifi/bluetooth co-exist"); 69MODULE_PARM_DESC(bt_coex_active, "enable wifi/bluetooth co-exist");
70 70
71u32 iwlegacy_debug_level; 71u32 il_debug_level;
72EXPORT_SYMBOL(iwlegacy_debug_level); 72EXPORT_SYMBOL(il_debug_level);
73 73
74const u8 iwlegacy_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; 74const u8 il_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
75EXPORT_SYMBOL(iwlegacy_bcast_addr); 75EXPORT_SYMBOL(il_bcast_addr);
76 76
77 77
78/* This function both allocates and initializes hw and il. */ 78/* This function both allocates and initializes hw and il. */
@@ -183,7 +183,7 @@ int il_init_geos(struct il_priv *il)
183 183
184 /* 5.2GHz channels start after the 2.4GHz channels */ 184 /* 5.2GHz channels start after the 2.4GHz channels */
185 sband = &il->bands[IEEE80211_BAND_5GHZ]; 185 sband = &il->bands[IEEE80211_BAND_5GHZ];
186 sband->channels = &channels[ARRAY_SIZE(iwlegacy_eeprom_band_1)]; 186 sband->channels = &channels[ARRAY_SIZE(il_eeprom_band_1)];
187 /* just OFDM */ 187 /* just OFDM */
188 sband->bitrates = &rates[IL_FIRST_OFDM_RATE]; 188 sband->bitrates = &rates[IL_FIRST_OFDM_RATE];
189 sband->n_bitrates = IL_RATE_COUNT_LEGACY - IL_FIRST_OFDM_RATE; 189 sband->n_bitrates = IL_RATE_COUNT_LEGACY - IL_FIRST_OFDM_RATE;
@@ -1486,7 +1486,7 @@ int il_alloc_traffic_mem(struct il_priv *il)
1486{ 1486{
1487 u32 traffic_size = IL_TRAFFIC_DUMP_SIZE; 1487 u32 traffic_size = IL_TRAFFIC_DUMP_SIZE;
1488 1488
1489 if (iwlegacy_debug_level & IL_DL_TX) { 1489 if (il_debug_level & IL_DL_TX) {
1490 if (!il->tx_traffic) { 1490 if (!il->tx_traffic) {
1491 il->tx_traffic = 1491 il->tx_traffic =
1492 kzalloc(traffic_size, GFP_KERNEL); 1492 kzalloc(traffic_size, GFP_KERNEL);
@@ -1494,7 +1494,7 @@ int il_alloc_traffic_mem(struct il_priv *il)
1494 return -ENOMEM; 1494 return -ENOMEM;
1495 } 1495 }
1496 } 1496 }
1497 if (iwlegacy_debug_level & IL_DL_RX) { 1497 if (il_debug_level & IL_DL_RX) {
1498 if (!il->rx_traffic) { 1498 if (!il->rx_traffic) {
1499 il->rx_traffic = 1499 il->rx_traffic =
1500 kzalloc(traffic_size, GFP_KERNEL); 1500 kzalloc(traffic_size, GFP_KERNEL);
@@ -1523,7 +1523,7 @@ void il_dbg_log_tx_data_frame(struct il_priv *il,
1523 __le16 fc; 1523 __le16 fc;
1524 u16 len; 1524 u16 len;
1525 1525
1526 if (likely(!(iwlegacy_debug_level & IL_DL_TX))) 1526 if (likely(!(il_debug_level & IL_DL_TX)))
1527 return; 1527 return;
1528 1528
1529 if (!il->tx_traffic) 1529 if (!il->tx_traffic)
@@ -1548,7 +1548,7 @@ void il_dbg_log_rx_data_frame(struct il_priv *il,
1548 __le16 fc; 1548 __le16 fc;
1549 u16 len; 1549 u16 len;
1550 1550
1551 if (likely(!(iwlegacy_debug_level & IL_DL_RX))) 1551 if (likely(!(il_debug_level & IL_DL_RX)))
1552 return; 1552 return;
1553 1553
1554 if (!il->rx_traffic) 1554 if (!il->rx_traffic)
diff --git a/drivers/net/wireless/iwlegacy/iwl-debug.h b/drivers/net/wireless/iwlegacy/iwl-debug.h
index 657da25a2354..05a7933011b6 100644
--- a/drivers/net/wireless/iwlegacy/iwl-debug.h
+++ b/drivers/net/wireless/iwlegacy/iwl-debug.h
@@ -30,7 +30,7 @@
30#define __il_debug_h__ 30#define __il_debug_h__
31 31
32struct il_priv; 32struct il_priv;
33extern u32 iwlegacy_debug_level; 33extern u32 il_debug_level;
34 34
35#define IL_ERR(p, f, a...) dev_err(&((p)->pci_dev->dev), f, ## a) 35#define IL_ERR(p, f, a...) dev_err(&((p)->pci_dev->dev), f, ## a)
36#define IL_WARN(p, f, a...) dev_warn(&((p)->pci_dev->dev), f, ## a) 36#define IL_WARN(p, f, a...) dev_warn(&((p)->pci_dev->dev), f, ## a)
diff --git a/drivers/net/wireless/iwlegacy/iwl-debugfs.c b/drivers/net/wireless/iwlegacy/iwl-debugfs.c
index f2f2eba7d3ea..a811c17e9c62 100644
--- a/drivers/net/wireless/iwlegacy/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlegacy/iwl-debugfs.c
@@ -705,7 +705,7 @@ static ssize_t il_dbgfs_traffic_log_read(struct file *file,
705 "q[%d]: read_ptr: %u, write_ptr: %u\n", 705 "q[%d]: read_ptr: %u, write_ptr: %u\n",
706 cnt, q->read_ptr, q->write_ptr); 706 cnt, q->read_ptr, q->write_ptr);
707 } 707 }
708 if (il->tx_traffic && (iwlegacy_debug_level & IL_DL_TX)) { 708 if (il->tx_traffic && (il_debug_level & IL_DL_TX)) {
709 ptr = il->tx_traffic; 709 ptr = il->tx_traffic;
710 pos += scnprintf(buf + pos, bufsz - pos, 710 pos += scnprintf(buf + pos, bufsz - pos,
711 "Tx Traffic idx: %u\n", il->tx_traffic_idx); 711 "Tx Traffic idx: %u\n", il->tx_traffic_idx);
@@ -728,7 +728,7 @@ static ssize_t il_dbgfs_traffic_log_read(struct file *file,
728 "read: %u, write: %u\n", 728 "read: %u, write: %u\n",
729 rxq->read, rxq->write); 729 rxq->read, rxq->write);
730 730
731 if (il->rx_traffic && (iwlegacy_debug_level & IL_DL_RX)) { 731 if (il->rx_traffic && (il_debug_level & IL_DL_RX)) {
732 ptr = il->rx_traffic; 732 ptr = il->rx_traffic;
733 pos += scnprintf(buf + pos, bufsz - pos, 733 pos += scnprintf(buf + pos, bufsz - pos,
734 "Rx Traffic idx: %u\n", il->rx_traffic_idx); 734 "Rx Traffic idx: %u\n", il->rx_traffic_idx);
diff --git a/drivers/net/wireless/iwlegacy/iwl-dev.h b/drivers/net/wireless/iwlegacy/iwl-dev.h
index 824d1934a7a1..2e2e3f3f66f7 100644
--- a/drivers/net/wireless/iwlegacy/iwl-dev.h
+++ b/drivers/net/wireless/iwlegacy/iwl-dev.h
@@ -626,7 +626,7 @@ struct il_hw_params {
626 * 626 *
627 ****************************************************************************/ 627 ****************************************************************************/
628extern void il4965_update_chain_flags(struct il_priv *il); 628extern void il4965_update_chain_flags(struct il_priv *il);
629extern const u8 iwlegacy_bcast_addr[ETH_ALEN]; 629extern const u8 il_bcast_addr[ETH_ALEN];
630extern int il_queue_space(const struct il_queue *q); 630extern int il_queue_space(const struct il_queue *q);
631static inline int il_queue_used(const struct il_queue *q, int i) 631static inline int il_queue_used(const struct il_queue *q, int i)
632{ 632{
@@ -1220,7 +1220,7 @@ struct il_priv {
1220#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 1220#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
1221 /* debugging info */ 1221 /* debugging info */
1222 u32 debug_level; /* per device debugging will override global 1222 u32 debug_level; /* per device debugging will override global
1223 iwlegacy_debug_level if set */ 1223 il_debug_level if set */
1224#endif /* CONFIG_IWLWIFI_LEGACY_DEBUG */ 1224#endif /* CONFIG_IWLWIFI_LEGACY_DEBUG */
1225#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 1225#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
1226 /* debugfs */ 1226 /* debugfs */
@@ -1270,12 +1270,12 @@ static inline u32 il_get_debug_level(struct il_priv *il)
1270 if (il->debug_level) 1270 if (il->debug_level)
1271 return il->debug_level; 1271 return il->debug_level;
1272 else 1272 else
1273 return iwlegacy_debug_level; 1273 return il_debug_level;
1274} 1274}
1275#else 1275#else
1276static inline u32 il_get_debug_level(struct il_priv *il) 1276static inline u32 il_get_debug_level(struct il_priv *il)
1277{ 1277{
1278 return iwlegacy_debug_level; 1278 return il_debug_level;
1279} 1279}
1280#endif 1280#endif
1281 1281
diff --git a/drivers/net/wireless/iwlegacy/iwl-eeprom.c b/drivers/net/wireless/iwlegacy/iwl-eeprom.c
index 5edec73a505e..f6b9d6d28d9e 100644
--- a/drivers/net/wireless/iwlegacy/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlegacy/iwl-eeprom.c
@@ -77,7 +77,7 @@
77 77
78/************************** EEPROM BANDS **************************** 78/************************** EEPROM BANDS ****************************
79 * 79 *
80 * The iwlegacy_eeprom_band definitions below provide the mapping from the 80 * The il_eeprom_band definitions below provide the mapping from the
81 * EEPROM contents to the specific channel number supported for each 81 * EEPROM contents to the specific channel number supported for each
82 * band. 82 * band.
83 * 83 *
@@ -107,32 +107,32 @@
107 *********************************************************************/ 107 *********************************************************************/
108 108
109/* 2.4 GHz */ 109/* 2.4 GHz */
110const u8 iwlegacy_eeprom_band_1[14] = { 110const u8 il_eeprom_band_1[14] = {
111 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 111 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
112}; 112};
113 113
114/* 5.2 GHz bands */ 114/* 5.2 GHz bands */
115static const u8 iwlegacy_eeprom_band_2[] = { /* 4915-5080MHz */ 115static const u8 il_eeprom_band_2[] = { /* 4915-5080MHz */
116 183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16 116 183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16
117}; 117};
118 118
119static const u8 iwlegacy_eeprom_band_3[] = { /* 5170-5320MHz */ 119static const u8 il_eeprom_band_3[] = { /* 5170-5320MHz */
120 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64 120 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64
121}; 121};
122 122
123static const u8 iwlegacy_eeprom_band_4[] = { /* 5500-5700MHz */ 123static const u8 il_eeprom_band_4[] = { /* 5500-5700MHz */
124 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140 124 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140
125}; 125};
126 126
127static const u8 iwlegacy_eeprom_band_5[] = { /* 5725-5825MHz */ 127static const u8 il_eeprom_band_5[] = { /* 5725-5825MHz */
128 145, 149, 153, 157, 161, 165 128 145, 149, 153, 157, 161, 165
129}; 129};
130 130
131static const u8 iwlegacy_eeprom_band_6[] = { /* 2.4 ht40 channel */ 131static const u8 il_eeprom_band_6[] = { /* 2.4 ht40 channel */
132 1, 2, 3, 4, 5, 6, 7 132 1, 2, 3, 4, 5, 6, 7
133}; 133};
134 134
135static const u8 iwlegacy_eeprom_band_7[] = { /* 5.2 ht40 channel */ 135static const u8 il_eeprom_band_7[] = { /* 5.2 ht40 channel */
136 36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157 136 36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157
137}; 137};
138 138
@@ -273,46 +273,46 @@ static void il_init_band_reference(const struct il_priv *il,
273 eeprom_ops.regulatory_bands[eep_band - 1]; 273 eeprom_ops.regulatory_bands[eep_band - 1];
274 switch (eep_band) { 274 switch (eep_band) {
275 case 1: /* 2.4GHz band */ 275 case 1: /* 2.4GHz band */
276 *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_1); 276 *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_1);
277 *eeprom_ch_info = (struct il_eeprom_channel *) 277 *eeprom_ch_info = (struct il_eeprom_channel *)
278 il_eeprom_query_addr(il, offset); 278 il_eeprom_query_addr(il, offset);
279 *eeprom_ch_index = iwlegacy_eeprom_band_1; 279 *eeprom_ch_index = il_eeprom_band_1;
280 break; 280 break;
281 case 2: /* 4.9GHz band */ 281 case 2: /* 4.9GHz band */
282 *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_2); 282 *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_2);
283 *eeprom_ch_info = (struct il_eeprom_channel *) 283 *eeprom_ch_info = (struct il_eeprom_channel *)
284 il_eeprom_query_addr(il, offset); 284 il_eeprom_query_addr(il, offset);
285 *eeprom_ch_index = iwlegacy_eeprom_band_2; 285 *eeprom_ch_index = il_eeprom_band_2;
286 break; 286 break;
287 case 3: /* 5.2GHz band */ 287 case 3: /* 5.2GHz band */
288 *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_3); 288 *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_3);
289 *eeprom_ch_info = (struct il_eeprom_channel *) 289 *eeprom_ch_info = (struct il_eeprom_channel *)
290 il_eeprom_query_addr(il, offset); 290 il_eeprom_query_addr(il, offset);
291 *eeprom_ch_index = iwlegacy_eeprom_band_3; 291 *eeprom_ch_index = il_eeprom_band_3;
292 break; 292 break;
293 case 4: /* 5.5GHz band */ 293 case 4: /* 5.5GHz band */
294 *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_4); 294 *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_4);
295 *eeprom_ch_info = (struct il_eeprom_channel *) 295 *eeprom_ch_info = (struct il_eeprom_channel *)
296 il_eeprom_query_addr(il, offset); 296 il_eeprom_query_addr(il, offset);
297 *eeprom_ch_index = iwlegacy_eeprom_band_4; 297 *eeprom_ch_index = il_eeprom_band_4;
298 break; 298 break;
299 case 5: /* 5.7GHz band */ 299 case 5: /* 5.7GHz band */
300 *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_5); 300 *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_5);
301 *eeprom_ch_info = (struct il_eeprom_channel *) 301 *eeprom_ch_info = (struct il_eeprom_channel *)
302 il_eeprom_query_addr(il, offset); 302 il_eeprom_query_addr(il, offset);
303 *eeprom_ch_index = iwlegacy_eeprom_band_5; 303 *eeprom_ch_index = il_eeprom_band_5;
304 break; 304 break;
305 case 6: /* 2.4GHz ht40 channels */ 305 case 6: /* 2.4GHz ht40 channels */
306 *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_6); 306 *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_6);
307 *eeprom_ch_info = (struct il_eeprom_channel *) 307 *eeprom_ch_info = (struct il_eeprom_channel *)
308 il_eeprom_query_addr(il, offset); 308 il_eeprom_query_addr(il, offset);
309 *eeprom_ch_index = iwlegacy_eeprom_band_6; 309 *eeprom_ch_index = il_eeprom_band_6;
310 break; 310 break;
311 case 7: /* 5 GHz ht40 channels */ 311 case 7: /* 5 GHz ht40 channels */
312 *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_7); 312 *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_7);
313 *eeprom_ch_info = (struct il_eeprom_channel *) 313 *eeprom_ch_info = (struct il_eeprom_channel *)
314 il_eeprom_query_addr(il, offset); 314 il_eeprom_query_addr(il, offset);
315 *eeprom_ch_index = iwlegacy_eeprom_band_7; 315 *eeprom_ch_index = il_eeprom_band_7;
316 break; 316 break;
317 default: 317 default:
318 BUG(); 318 BUG();
@@ -387,11 +387,11 @@ int il_init_channel_map(struct il_priv *il)
387 IL_DEBUG_EEPROM(il, "Initializing regulatory info from EEPROM\n"); 387 IL_DEBUG_EEPROM(il, "Initializing regulatory info from EEPROM\n");
388 388
389 il->channel_count = 389 il->channel_count =
390 ARRAY_SIZE(iwlegacy_eeprom_band_1) + 390 ARRAY_SIZE(il_eeprom_band_1) +
391 ARRAY_SIZE(iwlegacy_eeprom_band_2) + 391 ARRAY_SIZE(il_eeprom_band_2) +
392 ARRAY_SIZE(iwlegacy_eeprom_band_3) + 392 ARRAY_SIZE(il_eeprom_band_3) +
393 ARRAY_SIZE(iwlegacy_eeprom_band_4) + 393 ARRAY_SIZE(il_eeprom_band_4) +
394 ARRAY_SIZE(iwlegacy_eeprom_band_5); 394 ARRAY_SIZE(il_eeprom_band_5);
395 395
396 IL_DEBUG_EEPROM(il, "Parsing data for %d channels.\n", 396 IL_DEBUG_EEPROM(il, "Parsing data for %d channels.\n",
397 il->channel_count); 397 il->channel_count);
diff --git a/drivers/net/wireless/iwlegacy/iwl-eeprom.h b/drivers/net/wireless/iwlegacy/iwl-eeprom.h
index acb5ec17d70d..b97c83735c76 100644
--- a/drivers/net/wireless/iwlegacy/iwl-eeprom.h
+++ b/drivers/net/wireless/iwlegacy/iwl-eeprom.h
@@ -144,7 +144,7 @@ struct il_eeprom_channel {
144#define EEPROM_4965_BOARD_PBA (2*0x56+1) /* 9 bytes */ 144#define EEPROM_4965_BOARD_PBA (2*0x56+1) /* 9 bytes */
145 145
146/* 2.4 GHz */ 146/* 2.4 GHz */
147extern const u8 iwlegacy_eeprom_band_1[14]; 147extern const u8 il_eeprom_band_1[14];
148 148
149/* 149/*
150 * factory calibration data for one txpower level, on one channel, 150 * factory calibration data for one txpower level, on one channel,
diff --git a/drivers/net/wireless/iwlegacy/iwl-legacy-rs.h b/drivers/net/wireless/iwlegacy/iwl-legacy-rs.h
index 4282ed553b92..744829a66284 100644
--- a/drivers/net/wireless/iwlegacy/iwl-legacy-rs.h
+++ b/drivers/net/wireless/iwlegacy/iwl-legacy-rs.h
@@ -56,7 +56,7 @@ struct il3945_rate_info {
56 56
57/* 57/*
58 * These serve as indexes into 58 * These serve as indexes into
59 * struct il_rate_info iwlegacy_rates[IL_RATE_COUNT]; 59 * struct il_rate_info il_rates[IL_RATE_COUNT];
60 */ 60 */
61enum { 61enum {
62 IL_RATE_1M_INDEX = 0, 62 IL_RATE_1M_INDEX = 0,
@@ -268,7 +268,7 @@ enum {
268#define TID_MAX_TIME_DIFF ((TID_QUEUE_MAX_SIZE - 1) * TID_QUEUE_CELL_SPACING) 268#define TID_MAX_TIME_DIFF ((TID_QUEUE_MAX_SIZE - 1) * TID_QUEUE_CELL_SPACING)
269#define TIME_WRAP_AROUND(x, y) (((y) > (x)) ? (y) - (x) : (0-(x)) + (y)) 269#define TIME_WRAP_AROUND(x, y) (((y) > (x)) ? (y) - (x) : (0-(x)) + (y))
270 270
271extern const struct il_rate_info iwlegacy_rates[IL_RATE_COUNT]; 271extern const struct il_rate_info il_rates[IL_RATE_COUNT];
272 272
273enum il_table_type { 273enum il_table_type {
274 LQ_NONE, 274 LQ_NONE,
diff --git a/drivers/net/wireless/iwlegacy/iwl-scan.c b/drivers/net/wireless/iwlegacy/iwl-scan.c
index 0184d5bf04e2..5a967d2b15d1 100644
--- a/drivers/net/wireless/iwlegacy/iwl-scan.c
+++ b/drivers/net/wireless/iwlegacy/iwl-scan.c
@@ -442,9 +442,9 @@ il_fill_probe_req(struct il_priv *il, struct ieee80211_mgmt *frame,
442 return 0; 442 return 0;
443 443
444 frame->frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ); 444 frame->frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);
445 memcpy(frame->da, iwlegacy_bcast_addr, ETH_ALEN); 445 memcpy(frame->da, il_bcast_addr, ETH_ALEN);
446 memcpy(frame->sa, ta, ETH_ALEN); 446 memcpy(frame->sa, ta, ETH_ALEN);
447 memcpy(frame->bssid, iwlegacy_bcast_addr, ETH_ALEN); 447 memcpy(frame->bssid, il_bcast_addr, ETH_ALEN);
448 frame->seq_ctrl = 0; 448 frame->seq_ctrl = 0;
449 449
450 len += 24; 450 len += 24;
diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c
index 2c336a701dc5..af3f1945e17d 100644
--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
@@ -2378,7 +2378,7 @@ static int il3945_alloc_bcast_station(struct il_priv *il)
2378 2378
2379 spin_lock_irqsave(&il->sta_lock, flags); 2379 spin_lock_irqsave(&il->sta_lock, flags);
2380 sta_id = il_prep_station(il, ctx, 2380 sta_id = il_prep_station(il, ctx,
2381 iwlegacy_bcast_addr, false, NULL); 2381 il_bcast_addr, false, NULL);
2382 if (sta_id == IL_INVALID_STATION) { 2382 if (sta_id == IL_INVALID_STATION) {
2383 IL_ERR(il, "Unable to prepare broadcast station\n"); 2383 IL_ERR(il, "Unable to prepare broadcast station\n");
2384 spin_unlock_irqrestore(&il->sta_lock, flags); 2384 spin_unlock_irqrestore(&il->sta_lock, flags);
@@ -4003,7 +4003,7 @@ module_param_named(disable_hw_scan, il3945_mod_params.disable_hw_scan,
4003 int, S_IRUGO); 4003 int, S_IRUGO);
4004MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 1)"); 4004MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 1)");
4005#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 4005#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
4006module_param_named(debug, iwlegacy_debug_level, uint, S_IRUGO | S_IWUSR); 4006module_param_named(debug, il_debug_level, uint, S_IRUGO | S_IWUSR);
4007MODULE_PARM_DESC(debug, "debug output mask"); 4007MODULE_PARM_DESC(debug, "debug output mask");
4008#endif 4008#endif
4009module_param_named(fw_restart, il3945_mod_params.restart_fw, int, S_IRUGO); 4009module_param_named(fw_restart, il3945_mod_params.restart_fw, int, S_IRUGO);
diff --git a/drivers/net/wireless/iwlegacy/iwl4965-base.c b/drivers/net/wireless/iwlegacy/iwl4965-base.c
index ae8a93751561..d4eacc3cbe7f 100644
--- a/drivers/net/wireless/iwlegacy/iwl4965-base.c
+++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c
@@ -2712,7 +2712,7 @@ static void il4965_init_hw_rates(struct il_priv *il,
2712 int i; 2712 int i;
2713 2713
2714 for (i = 0; i < IL_RATE_COUNT_LEGACY; i++) { 2714 for (i = 0; i < IL_RATE_COUNT_LEGACY; i++) {
2715 rates[i].bitrate = iwlegacy_rates[i].ieee * 5; 2715 rates[i].bitrate = il_rates[i].ieee * 5;
2716 rates[i].hw_value = i; /* Rate scaling will work on indexes */ 2716 rates[i].hw_value = i; /* Rate scaling will work on indexes */
2717 rates[i].hw_value_short = i; 2717 rates[i].hw_value_short = i;
2718 rates[i].flags = 0; 2718 rates[i].flags = 0;
@@ -2721,7 +2721,7 @@ static void il4965_init_hw_rates(struct il_priv *il,
2721 * If CCK != 1M then set short preamble rate flag. 2721 * If CCK != 1M then set short preamble rate flag.
2722 */ 2722 */
2723 rates[i].flags |= 2723 rates[i].flags |=
2724 (iwlegacy_rates[i].plcp == IL_RATE_1M_PLCP) ? 2724 (il_rates[i].plcp == IL_RATE_1M_PLCP) ?
2725 0 : IEEE80211_RATE_SHORT_PREAMBLE; 2725 0 : IEEE80211_RATE_SHORT_PREAMBLE;
2726 } 2726 }
2727 } 2727 }
@@ -3259,7 +3259,7 @@ module_exit(il4965_exit);
3259module_init(il4965_init); 3259module_init(il4965_init);
3260 3260
3261#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 3261#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
3262module_param_named(debug, iwlegacy_debug_level, uint, S_IRUGO | S_IWUSR); 3262module_param_named(debug, il_debug_level, uint, S_IRUGO | S_IWUSR);
3263MODULE_PARM_DESC(debug, "debug output mask"); 3263MODULE_PARM_DESC(debug, "debug output mask");
3264#endif 3264#endif
3265 3265