aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2011-11-15 05:25:42 -0500
committerStanislaw Gruszka <sgruszka@redhat.com>2011-11-15 05:25:42 -0500
commitd31751679897441d89e6ae59da98f1424b3f7dfe (patch)
treec57920d4c02b89761d4390b2a1054ae964910e1e
parent232913b51e6f6e7105184b23a436dfc6b942491b (diff)
iwlegacy: rename remaining IWLs to ILs
Also rename config names IWLWIFI_LEGACY to IWLEGACY Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat
-rw-r--r--drivers/net/wireless/Makefile2
-rw-r--r--drivers/net/wireless/iwlegacy/Kconfig26
-rw-r--r--drivers/net/wireless/iwlegacy/Makefile8
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-3945-hw.h34
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-3945-rs.c2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-3945.c52
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-3945.h10
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-hw.h46
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-lib.c14
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-rs.c4
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-rx.c6
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-tx.c58
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-ucode.c4
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965.c42
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965.h2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-commands.h24
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-core.c14
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-core.h4
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-debug.h10
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-debugfs.c2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-dev.h26
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-hcmd.c2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-legacy-rs.h2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-prph.h58
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-scan.c6
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-sta.c2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-tx.c2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl3945-base.c64
-rw-r--r--drivers/net/wireless/iwlegacy/iwl4965-base.c71
31 files changed, 299 insertions, 302 deletions
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index c1c0678b1fb6..98db76196b59 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -42,7 +42,7 @@ obj-$(CONFIG_ADM8211) += adm8211.o
42obj-$(CONFIG_MWL8K) += mwl8k.o 42obj-$(CONFIG_MWL8K) += mwl8k.o
43 43
44obj-$(CONFIG_IWLWIFI) += iwlwifi/ 44obj-$(CONFIG_IWLWIFI) += iwlwifi/
45obj-$(CONFIG_IWLWIFI_LEGACY) += iwlegacy/ 45obj-$(CONFIG_IWLEGACY) += iwlegacy/
46obj-$(CONFIG_RT2X00) += rt2x00/ 46obj-$(CONFIG_RT2X00) += rt2x00/
47 47
48obj-$(CONFIG_P54_COMMON) += p54/ 48obj-$(CONFIG_P54_COMMON) += p54/
diff --git a/drivers/net/wireless/iwlegacy/Kconfig b/drivers/net/wireless/iwlegacy/Kconfig
index 2a1ae109ff25..b4be3b44f0a0 100644
--- a/drivers/net/wireless/iwlegacy/Kconfig
+++ b/drivers/net/wireless/iwlegacy/Kconfig
@@ -1,4 +1,4 @@
1config IWLWIFI_LEGACY 1config IWLEGACY
2 tristate 2 tristate
3 select FW_LOADER 3 select FW_LOADER
4 select NEW_LEDS 4 select NEW_LEDS
@@ -7,13 +7,13 @@ config IWLWIFI_LEGACY
7 select MAC80211_LEDS 7 select MAC80211_LEDS
8 8
9menu "Debugging Options" 9menu "Debugging Options"
10 depends on IWLWIFI_LEGACY 10 depends on IWLEGACY
11 11
12config IWLWIFI_LEGACY_DEBUG 12config IWLEGACY_DEBUG
13 bool "Enable full debugging output in 4965 and 3945 drivers" 13 bool "Enable full debugging output in iwlegacy (iwl 3945/4965) drivers"
14 depends on IWLWIFI_LEGACY 14 depends on IWLEGACY
15 ---help--- 15 ---help---
16 This option will enable debug tracing output for the iwlwifilegacy 16 This option will enable debug tracing output for the iwlegacy
17 drivers. 17 drivers.
18 18
19 This will result in the kernel module being ~100k larger. You can 19 This will result in the kernel module being ~100k larger. You can
@@ -29,17 +29,17 @@ config IWLWIFI_LEGACY_DEBUG
29 % echo 0x43fff > /sys/class/net/wlan0/device/debug_level 29 % echo 0x43fff > /sys/class/net/wlan0/device/debug_level
30 30
31 You can find the list of debug mask values in: 31 You can find the list of debug mask values in:
32 drivers/net/wireless/iwlwifilegacy/iwl-debug.h 32 drivers/net/wireless/iwlegacy/iwl-debug.h
33 33
34 If this is your first time using this driver, you should say Y here 34 If this is your first time using this driver, you should say Y here
35 as the debug information can assist others in helping you resolve 35 as the debug information can assist others in helping you resolve
36 any problems you may encounter. 36 any problems you may encounter.
37 37
38config IWLWIFI_LEGACY_DEBUGFS 38config IWLEGACY_DEBUGFS
39 bool "4965 and 3945 debugfs support" 39 bool "iwlegacy (iwl 3945/4965) debugfs support"
40 depends on IWLWIFI_LEGACY && MAC80211_DEBUGFS 40 depends on IWLEGACY && MAC80211_DEBUGFS
41 ---help--- 41 ---help---
42 Enable creation of debugfs files for the iwlwifilegacy drivers. This 42 Enable creation of debugfs files for the iwlegacy drivers. This
43 is a low-impact option that allows getting insight into the 43 is a low-impact option that allows getting insight into the
44 driver's state at runtime. 44 driver's state at runtime.
45 45
@@ -48,7 +48,7 @@ endmenu
48config IWL4965 48config IWL4965
49 tristate "Intel Wireless WiFi 4965AGN (iwl4965)" 49 tristate "Intel Wireless WiFi 4965AGN (iwl4965)"
50 depends on PCI && MAC80211 50 depends on PCI && MAC80211
51 select IWLWIFI_LEGACY 51 select IWLEGACY
52 ---help--- 52 ---help---
53 This option enables support for 53 This option enables support for
54 54
@@ -76,7 +76,7 @@ config IWL4965
76config IWL3945 76config IWL3945
77 tristate "Intel PRO/Wireless 3945ABG/BG Network Connection (iwl3945)" 77 tristate "Intel PRO/Wireless 3945ABG/BG Network Connection (iwl3945)"
78 depends on PCI && MAC80211 78 depends on PCI && MAC80211
79 select IWLWIFI_LEGACY 79 select IWLEGACY
80 ---help--- 80 ---help---
81 Select to build the driver supporting the: 81 Select to build the driver supporting the:
82 82
diff --git a/drivers/net/wireless/iwlegacy/Makefile b/drivers/net/wireless/iwlegacy/Makefile
index 4f67e45f22c0..49c4b36383cd 100644
--- a/drivers/net/wireless/iwlegacy/Makefile
+++ b/drivers/net/wireless/iwlegacy/Makefile
@@ -1,8 +1,8 @@
1obj-$(CONFIG_IWLWIFI_LEGACY) += iwl-legacy.o 1obj-$(CONFIG_IWLEGACY) += iwl-legacy.o
2iwl-legacy-objs := iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o 2iwl-legacy-objs := iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o
3iwl-legacy-objs += iwl-rx.o iwl-tx.o iwl-sta.o 3iwl-legacy-objs += iwl-rx.o iwl-tx.o iwl-sta.o
4iwl-legacy-objs += iwl-scan.o iwl-led.o 4iwl-legacy-objs += iwl-scan.o iwl-led.o
5iwl-legacy-$(CONFIG_IWLWIFI_LEGACY_DEBUGFS) += iwl-debugfs.o 5iwl-legacy-$(CONFIG_IWLEGACY_DEBUGFS) += iwl-debugfs.o
6 6
7iwl-legacy-objs += $(iwl-legacy-m) 7iwl-legacy-objs += $(iwl-legacy-m)
8 8
@@ -12,11 +12,11 @@ iwl4965-objs := iwl-4965.o iwl4965-base.o iwl-4965-rs.o iwl-4965-led.o
12iwl4965-objs += iwl-4965-ucode.o iwl-4965-tx.o 12iwl4965-objs += iwl-4965-ucode.o iwl-4965-tx.o
13iwl4965-objs += iwl-4965-lib.o iwl-4965-rx.o iwl-4965-calib.o 13iwl4965-objs += iwl-4965-lib.o iwl-4965-rx.o iwl-4965-calib.o
14iwl4965-objs += iwl-4965-sta.o iwl-4965-eeprom.o 14iwl4965-objs += iwl-4965-sta.o iwl-4965-eeprom.o
15iwl4965-$(CONFIG_IWLWIFI_LEGACY_DEBUGFS) += iwl-4965-debugfs.o 15iwl4965-$(CONFIG_IWLEGACY_DEBUGFS) += iwl-4965-debugfs.o
16 16
17# 3945 17# 3945
18obj-$(CONFIG_IWL3945) += iwl3945.o 18obj-$(CONFIG_IWL3945) += iwl3945.o
19iwl3945-objs := iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl-3945-led.o 19iwl3945-objs := iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl-3945-led.o
20iwl3945-$(CONFIG_IWLWIFI_LEGACY_DEBUGFS) += iwl-3945-debugfs.o 20iwl3945-$(CONFIG_IWLEGACY_DEBUGFS) += iwl-3945-debugfs.o
21 21
22ccflags-y += -D__CHECK_ENDIAN__ 22ccflags-y += -D__CHECK_ENDIAN__
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h b/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h
index 54334ac02788..9d1a4a041b18 100644
--- a/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h
+++ b/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h
@@ -30,7 +30,7 @@
30#include "iwl-core.h" 30#include "iwl-core.h"
31#include "iwl-debug.h" 31#include "iwl-debug.h"
32 32
33#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 33#ifdef CONFIG_IWLEGACY_DEBUGFS
34ssize_t il3945_ucode_rx_stats_read(struct file *file, char __user *user_buf, 34ssize_t il3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,
35 size_t count, loff_t *ppos); 35 size_t count, loff_t *ppos);
36ssize_t il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf, 36ssize_t il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-hw.h b/drivers/net/wireless/iwlegacy/iwl-3945-hw.h
index 67650ffa2d58..fcb466a2f065 100644
--- a/drivers/net/wireless/iwlegacy/iwl-3945-hw.h
+++ b/drivers/net/wireless/iwlegacy/iwl-3945-hw.h
@@ -72,7 +72,7 @@
72#include "iwl-eeprom.h" 72#include "iwl-eeprom.h"
73 73
74/* RSSI to dBm */ 74/* RSSI to dBm */
75#define IWL39_RSSI_OFFSET 95 75#define IL39_RSSI_OFFSET 95
76 76
77/* 77/*
78 * EEPROM related constants, enums, and structures. 78 * EEPROM related constants, enums, and structures.
@@ -214,7 +214,7 @@ struct il3945_eeprom {
214 u8 reserved16[172]; /* fill out to full 1024 byte block */ 214 u8 reserved16[172]; /* fill out to full 1024 byte block */
215} __packed; 215} __packed;
216 216
217#define IWL3945_EEPROM_IMG_SIZE 1024 217#define IL3945_EEPROM_IMG_SIZE 1024
218 218
219/* End of EEPROM */ 219/* End of EEPROM */
220 220
@@ -222,8 +222,8 @@ struct il3945_eeprom {
222#define PCI_CFG_REV_ID_BIT_RTP (0x80) /* bit 7 */ 222#define PCI_CFG_REV_ID_BIT_RTP (0x80) /* bit 7 */
223 223
224/* 4 DATA + 1 CMD. There are 2 HCCA queues that are not used. */ 224/* 4 DATA + 1 CMD. There are 2 HCCA queues that are not used. */
225#define IWL39_NUM_QUEUES 5 225#define IL39_NUM_QUEUES 5
226#define IWL39_CMD_QUEUE_NUM 4 226#define IL39_CMD_QUEUE_NUM 4
227 227
228#define IL_DEFAULT_TX_RETRY 15 228#define IL_DEFAULT_TX_RETRY 15
229 229
@@ -245,27 +245,27 @@ struct il3945_eeprom {
245 245
246/* Sizes and addresses for instruction and data memory (SRAM) in 246/* Sizes and addresses for instruction and data memory (SRAM) in
247 * 3945's embedded processor. Driver access is via HBUS_TARG_MEM_* regs. */ 247 * 3945's embedded processor. Driver access is via HBUS_TARG_MEM_* regs. */
248#define IWL39_RTC_INST_LOWER_BOUND (0x000000) 248#define IL39_RTC_INST_LOWER_BOUND (0x000000)
249#define IWL39_RTC_INST_UPPER_BOUND (0x014000) 249#define IL39_RTC_INST_UPPER_BOUND (0x014000)
250 250
251#define IWL39_RTC_DATA_LOWER_BOUND (0x800000) 251#define IL39_RTC_DATA_LOWER_BOUND (0x800000)
252#define IWL39_RTC_DATA_UPPER_BOUND (0x808000) 252#define IL39_RTC_DATA_UPPER_BOUND (0x808000)
253 253
254#define IWL39_RTC_INST_SIZE (IWL39_RTC_INST_UPPER_BOUND - \ 254#define IL39_RTC_INST_SIZE (IL39_RTC_INST_UPPER_BOUND - \
255 IWL39_RTC_INST_LOWER_BOUND) 255 IL39_RTC_INST_LOWER_BOUND)
256#define IWL39_RTC_DATA_SIZE (IWL39_RTC_DATA_UPPER_BOUND - \ 256#define IL39_RTC_DATA_SIZE (IL39_RTC_DATA_UPPER_BOUND - \
257 IWL39_RTC_DATA_LOWER_BOUND) 257 IL39_RTC_DATA_LOWER_BOUND)
258 258
259#define IWL39_MAX_INST_SIZE IWL39_RTC_INST_SIZE 259#define IL39_MAX_INST_SIZE IL39_RTC_INST_SIZE
260#define IWL39_MAX_DATA_SIZE IWL39_RTC_DATA_SIZE 260#define IL39_MAX_DATA_SIZE IL39_RTC_DATA_SIZE
261 261
262/* Size of uCode instruction memory in bootstrap state machine */ 262/* Size of uCode instruction memory in bootstrap state machine */
263#define IWL39_MAX_BSM_SIZE IWL39_RTC_INST_SIZE 263#define IL39_MAX_BSM_SIZE IL39_RTC_INST_SIZE
264 264
265static inline int il3945_hw_valid_rtc_data_addr(u32 addr) 265static inline int il3945_hw_valid_rtc_data_addr(u32 addr)
266{ 266{
267 return (addr >= IWL39_RTC_DATA_LOWER_BOUND && 267 return (addr >= IL39_RTC_DATA_LOWER_BOUND &&
268 addr < IWL39_RTC_DATA_UPPER_BOUND); 268 addr < IL39_RTC_DATA_UPPER_BOUND);
269} 269}
270 270
271/* Base physical address of il3945_shared is provided to FH_TSSR_CBB_BASE 271/* Base physical address of il3945_shared is provided to FH_TSSR_CBB_BASE
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-rs.c b/drivers/net/wireless/iwlegacy/iwl-3945-rs.c
index afa6be81f9a5..345beb7d3e83 100644
--- a/drivers/net/wireless/iwlegacy/iwl-3945-rs.c
+++ b/drivers/net/wireless/iwlegacy/iwl-3945-rs.c
@@ -90,7 +90,7 @@ static struct il3945_tpt_entry il3945_tpt_table_g[] = {
90#define IL_RATE_MAX_WINDOW 62 90#define IL_RATE_MAX_WINDOW 62
91#define IL_RATE_FLUSH (3*HZ) 91#define IL_RATE_FLUSH (3*HZ)
92#define IL_RATE_WIN_FLUSH (HZ/2) 92#define IL_RATE_WIN_FLUSH (HZ/2)
93#define IWL39_RATE_HIGH_TH 11520 93#define IL39_RATE_HIGH_TH 11520
94#define IL_SUCCESS_UP_TH 8960 94#define IL_SUCCESS_UP_TH 8960
95#define IL_SUCCESS_DOWN_TH 10880 95#define IL_SUCCESS_DOWN_TH 10880
96#define IL_RATE_MIN_FAILURE_TH 6 96#define IL_RATE_MIN_FAILURE_TH 6
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945.c b/drivers/net/wireless/iwlegacy/iwl-3945.c
index fb69b745f8a7..78e81b632280 100644
--- a/drivers/net/wireless/iwlegacy/iwl-3945.c
+++ b/drivers/net/wireless/iwlegacy/iwl-3945.c
@@ -200,7 +200,7 @@ static int il3945_hwrate_to_plcp_idx(u8 plcp)
200 return -1; 200 return -1;
201} 201}
202 202
203#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 203#ifdef CONFIG_IWLEGACY_DEBUG
204#define TX_STATUS_ENTRY(x) case TX_3945_STATUS_FAIL_ ## x: return #x 204#define TX_STATUS_ENTRY(x) case TX_3945_STATUS_FAIL_ ## x: return #x
205 205
206static const char *il3945_get_tx_fail_reason(u32 status) 206static const char *il3945_get_tx_fail_reason(u32 status)
@@ -281,7 +281,7 @@ static void il3945_tx_queue_reclaim(struct il_priv *il,
281 struct il_queue *q = &txq->q; 281 struct il_queue *q = &txq->q;
282 struct il_tx_info *tx_info; 282 struct il_tx_info *tx_info;
283 283
284 BUG_ON(txq_id == IWL39_CMD_QUEUE_NUM); 284 BUG_ON(txq_id == IL39_CMD_QUEUE_NUM);
285 285
286 for (index = il_queue_inc_wrap(index, q->n_bd); 286 for (index = il_queue_inc_wrap(index, q->n_bd);
287 q->read_ptr != index; 287 q->read_ptr != index;
@@ -294,7 +294,7 @@ static void il3945_tx_queue_reclaim(struct il_priv *il,
294 } 294 }
295 295
296 if (il_queue_space(q) > q->low_mark && txq_id >= 0 && 296 if (il_queue_space(q) > q->low_mark && txq_id >= 0 &&
297 txq_id != IWL39_CMD_QUEUE_NUM && il->mac80211_registered) 297 txq_id != IL39_CMD_QUEUE_NUM && il->mac80211_registered)
298 il_wake_queue(il, txq); 298 il_wake_queue(il, txq);
299} 299}
300 300
@@ -361,7 +361,7 @@ static void il3945_rx_reply_tx(struct il_priv *il,
361 * RX handler implementations 361 * RX handler implementations
362 * 362 *
363 *****************************************************************************/ 363 *****************************************************************************/
364#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 364#ifdef CONFIG_IWLEGACY_DEBUGFS
365static void il3945_accumulative_statistics(struct il_priv *il, 365static void il3945_accumulative_statistics(struct il_priv *il,
366 __le32 *stats) 366 __le32 *stats)
367{ 367{
@@ -403,7 +403,7 @@ void il3945_hw_rx_statistics(struct il_priv *il,
403 D_RX("Statistics notification received (%d vs %d).\n", 403 D_RX("Statistics notification received (%d vs %d).\n",
404 (int)sizeof(struct il3945_notif_statistics), 404 (int)sizeof(struct il3945_notif_statistics),
405 le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK); 405 le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK);
406#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 406#ifdef CONFIG_IWLEGACY_DEBUGFS
407 il3945_accumulative_statistics(il, (__le32 *)&pkt->u.raw); 407 il3945_accumulative_statistics(il, (__le32 *)&pkt->u.raw);
408#endif 408#endif
409 409
@@ -417,7 +417,7 @@ void il3945_reply_statistics(struct il_priv *il,
417 __le32 *flag = (__le32 *)&pkt->u.raw; 417 __le32 *flag = (__le32 *)&pkt->u.raw;
418 418
419 if (le32_to_cpu(*flag) & UCODE_STATISTICS_CLEAR_MSK) { 419 if (le32_to_cpu(*flag) & UCODE_STATISTICS_CLEAR_MSK) {
420#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 420#ifdef CONFIG_IWLEGACY_DEBUGFS
421 memset(&il->_3945.accum_statistics, 0, 421 memset(&il->_3945.accum_statistics, 0,
422 sizeof(struct il3945_notif_statistics)); 422 sizeof(struct il3945_notif_statistics));
423 memset(&il->_3945.delta_statistics, 0, 423 memset(&il->_3945.delta_statistics, 0,
@@ -468,7 +468,7 @@ static void il3945_pass_packet_to_mac80211(struct il_priv *il,
468 __le16 fc = hdr->frame_control; 468 __le16 fc = hdr->frame_control;
469 469
470 /* We received data from the HW, so stop the watchdog */ 470 /* We received data from the HW, so stop the watchdog */
471 if (unlikely(len + IWL39_RX_FRAME_SIZE > 471 if (unlikely(len + IL39_RX_FRAME_SIZE >
472 PAGE_SIZE << il->hw_params.rx_page_order)) { 472 PAGE_SIZE << il->hw_params.rx_page_order)) {
473 D_DROP("Corruption detected!\n"); 473 D_DROP("Corruption detected!\n");
474 return; 474 return;
@@ -552,7 +552,7 @@ static void il3945_rx_reply_rx(struct il_priv *il,
552 552
553 553
554 /* Convert 3945's rssi indicator to dBm */ 554 /* Convert 3945's rssi indicator to dBm */
555 rx_status.signal = rx_stats->rssi - IWL39_RSSI_OFFSET; 555 rx_status.signal = rx_stats->rssi - IL39_RSSI_OFFSET;
556 556
557 D_STATS("Rssi %d sig_avg %d noise_diff %d\n", 557 D_STATS("Rssi %d sig_avg %d noise_diff %d\n",
558 rx_status.signal, rx_stats_sig_avg, 558 rx_status.signal, rx_stats_sig_avg,
@@ -698,7 +698,7 @@ void il3945_hw_build_tx_cmd_rate(struct il_priv *il,
698 data_retry_limit = IL_DEFAULT_TX_RETRY; 698 data_retry_limit = IL_DEFAULT_TX_RETRY;
699 tx_cmd->data_retry_limit = data_retry_limit; 699 tx_cmd->data_retry_limit = data_retry_limit;
700 700
701 if (tx_id >= IWL39_CMD_QUEUE_NUM) 701 if (tx_id >= IL39_CMD_QUEUE_NUM)
702 rts_retry_limit = 3; 702 rts_retry_limit = 3;
703 else 703 else
704 rts_retry_limit = 7; 704 rts_retry_limit = 7;
@@ -849,7 +849,7 @@ static int il3945_txq_ctx_reset(struct il_priv *il)
849 849
850 /* Tx queue(s) */ 850 /* Tx queue(s) */
851 for (txq_id = 0; txq_id < il->hw_params.max_txq_num; txq_id++) { 851 for (txq_id = 0; txq_id < il->hw_params.max_txq_num; txq_id++) {
852 slots_num = (txq_id == IWL39_CMD_QUEUE_NUM) ? 852 slots_num = (txq_id == IL39_CMD_QUEUE_NUM) ?
853 TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS; 853 TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;
854 rc = il_tx_queue_init(il, &il->txq[txq_id], 854 rc = il_tx_queue_init(il, &il->txq[txq_id],
855 slots_num, txq_id); 855 slots_num, txq_id);
@@ -1010,7 +1010,7 @@ void il3945_hw_txq_ctx_free(struct il_priv *il)
1010 if (il->txq) 1010 if (il->txq)
1011 for (txq_id = 0; txq_id < il->hw_params.max_txq_num; 1011 for (txq_id = 0; txq_id < il->hw_params.max_txq_num;
1012 txq_id++) 1012 txq_id++)
1013 if (txq_id == IWL39_CMD_QUEUE_NUM) 1013 if (txq_id == IL39_CMD_QUEUE_NUM)
1014 il_cmd_queue_free(il); 1014 il_cmd_queue_free(il);
1015 else 1015 else
1016 il_tx_queue_free(il, txq_id); 1016 il_tx_queue_free(il, txq_id);
@@ -1402,7 +1402,7 @@ static int il3945_send_tx_power(struct il_priv *il)
1402 /* fill cmd with power settings for all rates for current channel */ 1402 /* fill cmd with power settings for all rates for current channel */
1403 /* Fill OFDM rate */ 1403 /* Fill OFDM rate */
1404 for (rate_idx = IL_FIRST_OFDM_RATE, i = 0; 1404 for (rate_idx = IL_FIRST_OFDM_RATE, i = 0;
1405 rate_idx <= IWL39_LAST_OFDM_RATE; rate_idx++, i++) { 1405 rate_idx <= IL39_LAST_OFDM_RATE; rate_idx++, i++) {
1406 1406
1407 txpower.power[i].tpc = ch_info->power_info[i].tpc; 1407 txpower.power[i].tpc = ch_info->power_info[i].tpc;
1408 txpower.power[i].rate = il3945_rates[rate_idx].plcp; 1408 txpower.power[i].rate = il3945_rates[rate_idx].plcp;
@@ -2400,14 +2400,14 @@ int il3945_hw_set_hw_params(struct il_priv *il)
2400 il->hw_params.rx_page_order = get_order(IL_RX_BUF_SIZE_3K); 2400 il->hw_params.rx_page_order = get_order(IL_RX_BUF_SIZE_3K);
2401 il->hw_params.max_rxq_size = RX_QUEUE_SIZE; 2401 il->hw_params.max_rxq_size = RX_QUEUE_SIZE;
2402 il->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG; 2402 il->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;
2403 il->hw_params.max_stations = IWL3945_STATION_COUNT; 2403 il->hw_params.max_stations = IL3945_STATION_COUNT;
2404 il->contexts[IL_RXON_CTX_BSS].bcast_sta_id = IWL3945_BROADCAST_ID; 2404 il->contexts[IL_RXON_CTX_BSS].bcast_sta_id = IL3945_BROADCAST_ID;
2405 2405
2406 il->sta_key_max_num = STA_KEY_MAX_NUM; 2406 il->sta_key_max_num = STA_KEY_MAX_NUM;
2407 2407
2408 il->hw_params.rx_wrt_ptr_reg = FH39_RSCSR_CHNL0_WPTR; 2408 il->hw_params.rx_wrt_ptr_reg = FH39_RSCSR_CHNL0_WPTR;
2409 il->hw_params.max_beacon_itrvl = IWL39_MAX_UCODE_BEACON_INTERVAL; 2409 il->hw_params.max_beacon_itrvl = IL39_MAX_UCODE_BEACON_INTERVAL;
2410 il->hw_params.beacon_time_tsf_bits = IWL3945_EXT_BEACON_TIME_POS; 2410 il->hw_params.beacon_time_tsf_bits = IL3945_EXT_BEACON_TIME_POS;
2411 2411
2412 return 0; 2412 return 0;
2413} 2413}
@@ -2569,7 +2569,7 @@ static int il3945_load_bsm(struct il_priv *il)
2569 D_INFO("Begin load bsm\n"); 2569 D_INFO("Begin load bsm\n");
2570 2570
2571 /* make sure bootstrap program is no larger than BSM's SRAM size */ 2571 /* make sure bootstrap program is no larger than BSM's SRAM size */
2572 if (len > IWL39_MAX_BSM_SIZE) 2572 if (len > IL39_MAX_BSM_SIZE)
2573 return -EINVAL; 2573 return -EINVAL;
2574 2574
2575 /* Tell bootstrap uCode where to find the "Initialize" uCode 2575 /* Tell bootstrap uCode where to find the "Initialize" uCode
@@ -2601,7 +2601,7 @@ static int il3945_load_bsm(struct il_priv *il)
2601 /* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */ 2601 /* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */
2602 il_wr_prph(il, BSM_WR_MEM_SRC_REG, 0x0); 2602 il_wr_prph(il, BSM_WR_MEM_SRC_REG, 0x0);
2603 il_wr_prph(il, BSM_WR_MEM_DST_REG, 2603 il_wr_prph(il, BSM_WR_MEM_DST_REG,
2604 IWL39_RTC_INST_LOWER_BOUND); 2604 IL39_RTC_INST_LOWER_BOUND);
2605 il_wr_prph(il, BSM_WR_DWCOUNT_REG, len / sizeof(u32)); 2605 il_wr_prph(il, BSM_WR_DWCOUNT_REG, len / sizeof(u32));
2606 2606
2607 /* Load bootstrap code into instruction SRAM now, 2607 /* Load bootstrap code into instruction SRAM now,
@@ -2692,8 +2692,8 @@ static const struct il_ops il3945_ops = {
2692}; 2692};
2693 2693
2694static struct il_base_params il3945_base_params = { 2694static struct il_base_params il3945_base_params = {
2695 .eeprom_size = IWL3945_EEPROM_IMG_SIZE, 2695 .eeprom_size = IL3945_EEPROM_IMG_SIZE,
2696 .num_of_queues = IWL39_NUM_QUEUES, 2696 .num_of_queues = IL39_NUM_QUEUES,
2697 .pll_cfg_val = CSR39_ANA_PLL_CFG_VAL, 2697 .pll_cfg_val = CSR39_ANA_PLL_CFG_VAL,
2698 .set_l0s = false, 2698 .set_l0s = false,
2699 .use_bsm = true, 2699 .use_bsm = true,
@@ -2703,9 +2703,9 @@ static struct il_base_params il3945_base_params = {
2703 2703
2704static struct il_cfg il3945_bg_cfg = { 2704static struct il_cfg il3945_bg_cfg = {
2705 .name = "3945BG", 2705 .name = "3945BG",
2706 .fw_name_pre = IWL3945_FW_PRE, 2706 .fw_name_pre = IL3945_FW_PRE,
2707 .ucode_api_max = IWL3945_UCODE_API_MAX, 2707 .ucode_api_max = IL3945_UCODE_API_MAX,
2708 .ucode_api_min = IWL3945_UCODE_API_MIN, 2708 .ucode_api_min = IL3945_UCODE_API_MIN,
2709 .sku = IL_SKU_G, 2709 .sku = IL_SKU_G,
2710 .eeprom_ver = EEPROM_3945_EEPROM_VERSION, 2710 .eeprom_ver = EEPROM_3945_EEPROM_VERSION,
2711 .ops = &il3945_ops, 2711 .ops = &il3945_ops,
@@ -2716,9 +2716,9 @@ static struct il_cfg il3945_bg_cfg = {
2716 2716
2717static struct il_cfg il3945_abg_cfg = { 2717static struct il_cfg il3945_abg_cfg = {
2718 .name = "3945ABG", 2718 .name = "3945ABG",
2719 .fw_name_pre = IWL3945_FW_PRE, 2719 .fw_name_pre = IL3945_FW_PRE,
2720 .ucode_api_max = IWL3945_UCODE_API_MAX, 2720 .ucode_api_max = IL3945_UCODE_API_MAX,
2721 .ucode_api_min = IWL3945_UCODE_API_MIN, 2721 .ucode_api_min = IL3945_UCODE_API_MIN,
2722 .sku = IL_SKU_A|IL_SKU_G, 2722 .sku = IL_SKU_A|IL_SKU_G,
2723 .eeprom_ver = EEPROM_3945_EEPROM_VERSION, 2723 .eeprom_ver = EEPROM_3945_EEPROM_VERSION,
2724 .ops = &il3945_ops, 2724 .ops = &il3945_ops,
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945.h b/drivers/net/wireless/iwlegacy/iwl-3945.h
index abe778b1b424..6c68f597f32f 100644
--- a/drivers/net/wireless/iwlegacy/iwl-3945.h
+++ b/drivers/net/wireless/iwlegacy/iwl-3945.h
@@ -49,14 +49,14 @@ extern const struct pci_device_id il3945_hw_card_ids[];
49#include "iwl-led.h" 49#include "iwl-led.h"
50 50
51/* Highest firmware API version supported */ 51/* Highest firmware API version supported */
52#define IWL3945_UCODE_API_MAX 2 52#define IL3945_UCODE_API_MAX 2
53 53
54/* Lowest firmware API version supported */ 54/* Lowest firmware API version supported */
55#define IWL3945_UCODE_API_MIN 1 55#define IL3945_UCODE_API_MIN 1
56 56
57#define IWL3945_FW_PRE "iwlwifi-3945-" 57#define IL3945_FW_PRE "iwlwifi-3945-"
58#define _IWL3945_MODULE_FIRMWARE(api) IWL3945_FW_PRE #api ".ucode" 58#define _IL3945_MODULE_FIRMWARE(api) IL3945_FW_PRE #api ".ucode"
59#define IWL3945_MODULE_FIRMWARE(api) _IWL3945_MODULE_FIRMWARE(api) 59#define IL3945_MODULE_FIRMWARE(api) _IL3945_MODULE_FIRMWARE(api)
60 60
61/* Default noise level to report when noise measurement is not available. 61/* Default noise level to report when noise measurement is not available.
62 * This may be because we're: 62 * This may be because we're:
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h b/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h
index ca1cf586f07b..284604c49440 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h
@@ -30,7 +30,7 @@
30#include "iwl-core.h" 30#include "iwl-core.h"
31#include "iwl-debug.h" 31#include "iwl-debug.h"
32 32
33#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 33#ifdef CONFIG_IWLEGACY_DEBUGFS
34ssize_t il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf, 34ssize_t il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
35 size_t count, loff_t *ppos); 35 size_t count, loff_t *ppos);
36ssize_t il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf, 36ssize_t il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-hw.h b/drivers/net/wireless/iwlegacy/iwl-4965-hw.h
index b21c0040c20a..ecebc6923125 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-hw.h
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-hw.h
@@ -72,38 +72,38 @@
72#include "iwl-fh.h" 72#include "iwl-fh.h"
73 73
74/* EEPROM */ 74/* EEPROM */
75#define IWL4965_EEPROM_IMG_SIZE 1024 75#define IL4965_EEPROM_IMG_SIZE 1024
76 76
77/* 77/*
78 * uCode queue management definitions ... 78 * uCode queue management definitions ...
79 * The first queue used for block-ack aggregation is #7 (4965 only). 79 * The first queue used for block-ack aggregation is #7 (4965 only).
80 * All block-ack aggregation queues should map to Tx DMA/FIFO channel 7. 80 * All block-ack aggregation queues should map to Tx DMA/FIFO channel 7.
81 */ 81 */
82#define IWL49_FIRST_AMPDU_QUEUE 7 82#define IL49_FIRST_AMPDU_QUEUE 7
83 83
84/* Sizes and addresses for instruction and data memory (SRAM) in 84/* Sizes and addresses for instruction and data memory (SRAM) in
85 * 4965's embedded processor. Driver access is via HBUS_TARG_MEM_* regs. */ 85 * 4965's embedded processor. Driver access is via HBUS_TARG_MEM_* regs. */
86#define IWL49_RTC_INST_LOWER_BOUND (0x000000) 86#define IL49_RTC_INST_LOWER_BOUND (0x000000)
87#define IWL49_RTC_INST_UPPER_BOUND (0x018000) 87#define IL49_RTC_INST_UPPER_BOUND (0x018000)
88 88
89#define IWL49_RTC_DATA_LOWER_BOUND (0x800000) 89#define IL49_RTC_DATA_LOWER_BOUND (0x800000)
90#define IWL49_RTC_DATA_UPPER_BOUND (0x80A000) 90#define IL49_RTC_DATA_UPPER_BOUND (0x80A000)
91 91
92#define IWL49_RTC_INST_SIZE (IWL49_RTC_INST_UPPER_BOUND - \ 92#define IL49_RTC_INST_SIZE (IL49_RTC_INST_UPPER_BOUND - \
93 IWL49_RTC_INST_LOWER_BOUND) 93 IL49_RTC_INST_LOWER_BOUND)
94#define IWL49_RTC_DATA_SIZE (IWL49_RTC_DATA_UPPER_BOUND - \ 94#define IL49_RTC_DATA_SIZE (IL49_RTC_DATA_UPPER_BOUND - \
95 IWL49_RTC_DATA_LOWER_BOUND) 95 IL49_RTC_DATA_LOWER_BOUND)
96 96
97#define IWL49_MAX_INST_SIZE IWL49_RTC_INST_SIZE 97#define IL49_MAX_INST_SIZE IL49_RTC_INST_SIZE
98#define IWL49_MAX_DATA_SIZE IWL49_RTC_DATA_SIZE 98#define IL49_MAX_DATA_SIZE IL49_RTC_DATA_SIZE
99 99
100/* Size of uCode instruction memory in bootstrap state machine */ 100/* Size of uCode instruction memory in bootstrap state machine */
101#define IWL49_MAX_BSM_SIZE BSM_SRAM_SIZE 101#define IL49_MAX_BSM_SIZE BSM_SRAM_SIZE
102 102
103static inline int il4965_hw_valid_rtc_data_addr(u32 addr) 103static inline int il4965_hw_valid_rtc_data_addr(u32 addr)
104{ 104{
105 return (addr >= IWL49_RTC_DATA_LOWER_BOUND && 105 return (addr >= IL49_RTC_DATA_LOWER_BOUND &&
106 addr < IWL49_RTC_DATA_UPPER_BOUND); 106 addr < IL49_RTC_DATA_UPPER_BOUND);
107} 107}
108 108
109/********************* START TEMPERATURE *************************************/ 109/********************* START TEMPERATURE *************************************/
@@ -760,10 +760,10 @@ enum {
760 * up to 7 DMA channels (FIFOs). Each Tx queue is supported by a circular array 760 * up to 7 DMA channels (FIFOs). Each Tx queue is supported by a circular array
761 * in DRAM containing 256 Transmit Frame Descriptors (TFDs). 761 * in DRAM containing 256 Transmit Frame Descriptors (TFDs).
762 */ 762 */
763#define IWL49_NUM_FIFOS 7 763#define IL49_NUM_FIFOS 7
764#define IWL49_CMD_FIFO_NUM 4 764#define IL49_CMD_FIFO_NUM 4
765#define IWL49_NUM_QUEUES 16 765#define IL49_NUM_QUEUES 16
766#define IWL49_NUM_AMPDU_QUEUES 8 766#define IL49_NUM_AMPDU_QUEUES 8
767 767
768 768
769/** 769/**
@@ -790,10 +790,10 @@ struct il4965_scd_bc_tbl {
790} __packed; 790} __packed;
791 791
792 792
793#define IWL4965_RTC_INST_LOWER_BOUND (0x000000) 793#define IL4965_RTC_INST_LOWER_BOUND (0x000000)
794 794
795/* RSSI to dBm */ 795/* RSSI to dBm */
796#define IWL4965_RSSI_OFFSET 44 796#define IL4965_RSSI_OFFSET 44
797 797
798/* PCI registers */ 798/* PCI registers */
799#define PCI_CFG_RETRY_TIMEOUT 0x041 799#define PCI_CFG_RETRY_TIMEOUT 0x041
@@ -802,10 +802,10 @@ struct il4965_scd_bc_tbl {
802#define PCI_CFG_LINK_CTRL_VAL_L0S_EN 0x01 802#define PCI_CFG_LINK_CTRL_VAL_L0S_EN 0x01
803#define PCI_CFG_LINK_CTRL_VAL_L1_EN 0x02 803#define PCI_CFG_LINK_CTRL_VAL_L1_EN 0x02
804 804
805#define IWL4965_DEFAULT_TX_RETRY 15 805#define IL4965_DEFAULT_TX_RETRY 15
806 806
807/* EEPROM */ 807/* EEPROM */
808#define IWL4965_FIRST_AMPDU_QUEUE 10 808#define IL4965_FIRST_AMPDU_QUEUE 10
809 809
810 810
811#endif /* !__il_4965_hw_h__ */ 811#endif /* !__il_4965_hw_h__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c b/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
index 8bb2b6280d72..964d9bb314b7 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
@@ -438,12 +438,12 @@ static int il4965_calc_rssi(struct il_priv *il,
438 * contents are always there, not configurable by host. */ 438 * contents are always there, not configurable by host. */
439 struct il4965_rx_non_cfg_phy *ncphy = 439 struct il4965_rx_non_cfg_phy *ncphy =
440 (struct il4965_rx_non_cfg_phy *)rx_resp->non_cfg_phy_buf; 440 (struct il4965_rx_non_cfg_phy *)rx_resp->non_cfg_phy_buf;
441 u32 agc = (le16_to_cpu(ncphy->agc_info) & IWL49_AGC_DB_MASK) 441 u32 agc = (le16_to_cpu(ncphy->agc_info) & IL49_AGC_DB_MASK)
442 >> IWL49_AGC_DB_POS; 442 >> IL49_AGC_DB_POS;
443 443
444 u32 valid_antennae = 444 u32 valid_antennae =
445 (le16_to_cpu(rx_resp->phy_flags) & IWL49_RX_PHY_FLAGS_ANTENNAE_MASK) 445 (le16_to_cpu(rx_resp->phy_flags) & IL49_RX_PHY_FLAGS_ANTENNAE_MASK)
446 >> IWL49_RX_PHY_FLAGS_ANTENNAE_OFFSET; 446 >> IL49_RX_PHY_FLAGS_ANTENNAE_OFFSET;
447 u8 max_rssi = 0; 447 u8 max_rssi = 0;
448 u32 i; 448 u32 i;
449 449
@@ -462,7 +462,7 @@ static int il4965_calc_rssi(struct il_priv *il,
462 462
463 /* dBm = max_rssi dB - agc dB - constant. 463 /* dBm = max_rssi dB - agc dB - constant.
464 * Higher AGC (higher radio gain) means lower signal. */ 464 * Higher AGC (higher radio gain) means lower signal. */
465 return max_rssi - agc - IWL4965_RSSI_OFFSET; 465 return max_rssi - agc - IL4965_RSSI_OFFSET;
466} 466}
467 467
468 468
@@ -1152,7 +1152,7 @@ static const char *il4965_get_fh_string(int cmd)
1152int il4965_dump_fh(struct il_priv *il, char **buf, bool display) 1152int il4965_dump_fh(struct il_priv *il, char **buf, bool display)
1153{ 1153{
1154 int i; 1154 int i;
1155#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 1155#ifdef CONFIG_IWLEGACY_DEBUG
1156 int pos = 0; 1156 int pos = 0;
1157 size_t bufsz = 0; 1157 size_t bufsz = 0;
1158#endif 1158#endif
@@ -1167,7 +1167,7 @@ int il4965_dump_fh(struct il_priv *il, char **buf, bool display)
1167 FH_TSSR_TX_STATUS_REG, 1167 FH_TSSR_TX_STATUS_REG,
1168 FH_TSSR_TX_ERROR_REG 1168 FH_TSSR_TX_ERROR_REG
1169 }; 1169 };
1170#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 1170#ifdef CONFIG_IWLEGACY_DEBUG
1171 if (display) { 1171 if (display) {
1172 bufsz = ARRAY_SIZE(fh_tbl) * 48 + 40; 1172 bufsz = ARRAY_SIZE(fh_tbl) * 48 + 40;
1173 *buf = kmalloc(bufsz, GFP_KERNEL); 1173 *buf = kmalloc(bufsz, GFP_KERNEL);
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c b/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
index c2f42301014d..9c8cc320832e 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
@@ -40,7 +40,7 @@
40#include "iwl-core.h" 40#include "iwl-core.h"
41#include "iwl-4965.h" 41#include "iwl-4965.h"
42 42
43#define IWL4965_RS_NAME "iwl-4965-rs" 43#define IL4965_RS_NAME "iwl-4965-rs"
44 44
45#define NUM_TRY_BEFORE_ANT_TOGGLE 1 45#define NUM_TRY_BEFORE_ANT_TOGGLE 1
46#define IL_NUMBER_TRY 1 46#define IL_NUMBER_TRY 1
@@ -2837,7 +2837,7 @@ il4965_rs_rate_init_stub(void *il_r, struct ieee80211_supported_band *sband,
2837} 2837}
2838static struct rate_control_ops rs_4965_ops = { 2838static struct rate_control_ops rs_4965_ops = {
2839 .module = NULL, 2839 .module = NULL,
2840 .name = IWL4965_RS_NAME, 2840 .name = IL4965_RS_NAME,
2841 .tx_status = il4965_rs_tx_status, 2841 .tx_status = il4965_rs_tx_status,
2842 .get_rate = il4965_rs_get_rate, 2842 .get_rate = il4965_rs_get_rate,
2843 .rate_init = il4965_rs_rate_init_stub, 2843 .rate_init = il4965_rs_rate_init_stub,
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-rx.c b/drivers/net/wireless/iwlegacy/iwl-4965-rx.c
index 45e8a24c938d..2181ec071cd4 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-rx.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-rx.c
@@ -105,7 +105,7 @@ static void il4965_rx_calc_noise(struct il_priv *il)
105 last_rx_noise); 105 last_rx_noise);
106} 106}
107 107
108#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 108#ifdef CONFIG_IWLEGACY_DEBUGFS
109/* 109/*
110 * based on the assumption of all statistics counter are in DWORD 110 * based on the assumption of all statistics counter are in DWORD
111 * FIXME: This function is for debugging, do not deal with 111 * FIXME: This function is for debugging, do not deal with
@@ -169,7 +169,7 @@ void il4965_rx_statistics(struct il_priv *il,
169 STATISTICS_REPLY_FLG_HT40_MODE_MSK) != 169 STATISTICS_REPLY_FLG_HT40_MODE_MSK) !=
170 (pkt->u.stats.flag & 170 (pkt->u.stats.flag &
171 STATISTICS_REPLY_FLG_HT40_MODE_MSK))); 171 STATISTICS_REPLY_FLG_HT40_MODE_MSK)));
172#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 172#ifdef CONFIG_IWLEGACY_DEBUGFS
173 il4965_accumulative_statistics(il, (__le32 *)&pkt->u.stats); 173 il4965_accumulative_statistics(il, (__le32 *)&pkt->u.stats);
174#endif 174#endif
175 175
@@ -201,7 +201,7 @@ void il4965_reply_statistics(struct il_priv *il,
201 struct il_rx_packet *pkt = rxb_addr(rxb); 201 struct il_rx_packet *pkt = rxb_addr(rxb);
202 202
203 if (le32_to_cpu(pkt->u.stats.flag) & UCODE_STATISTICS_CLEAR_MSK) { 203 if (le32_to_cpu(pkt->u.stats.flag) & UCODE_STATISTICS_CLEAR_MSK) {
204#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 204#ifdef CONFIG_IWLEGACY_DEBUGFS
205 memset(&il->_4965.accum_statistics, 0, 205 memset(&il->_4965.accum_statistics, 0,
206 sizeof(struct il_notif_statistics)); 206 sizeof(struct il_notif_statistics));
207 memset(&il->_4965.delta_statistics, 0, 207 memset(&il->_4965.delta_statistics, 0,
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-tx.c b/drivers/net/wireless/iwlegacy/iwl-4965-tx.c
index a32a4f32b97d..5f6a4ba9cb1c 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-tx.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-tx.c
@@ -171,7 +171,7 @@ static void il4965_tx_cmd_build_rate(struct il_priv *il,
171 if (ieee80211_is_probe_resp(fc)) 171 if (ieee80211_is_probe_resp(fc))
172 data_retry_limit = 3; 172 data_retry_limit = 3;
173 else 173 else
174 data_retry_limit = IWL4965_DEFAULT_TX_RETRY; 174 data_retry_limit = IL4965_DEFAULT_TX_RETRY;
175 tx_cmd->data_retry_limit = data_retry_limit; 175 tx_cmd->data_retry_limit = data_retry_limit;
176 176
177 /* Set retry limit on RTS packets */ 177 /* Set retry limit on RTS packets */
@@ -304,7 +304,7 @@ int il4965_tx_skb(struct il_priv *il, struct sk_buff *skb)
304 304
305 fc = hdr->frame_control; 305 fc = hdr->frame_control;
306 306
307#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 307#ifdef CONFIG_IWLEGACY_DEBUG
308 if (ieee80211_is_auth(fc)) 308 if (ieee80211_is_auth(fc))
309 D_TX("Sending AUTH frame\n"); 309 D_TX("Sending AUTH frame\n");
310 else if (ieee80211_is_assoc_req(fc)) 310 else if (ieee80211_is_assoc_req(fc))
@@ -754,9 +754,9 @@ static void il4965_tx_queue_stop_scheduler(struct il_priv *il,
754 /* Simply stop the queue, but don't change any configuration; 754 /* Simply stop the queue, but don't change any configuration;
755 * the SCD_ACT_EN bit is the write-enable mask for the ACTIVE bit. */ 755 * the SCD_ACT_EN bit is the write-enable mask for the ACTIVE bit. */
756 il_wr_prph(il, 756 il_wr_prph(il,
757 IWL49_SCD_QUEUE_STATUS_BITS(txq_id), 757 IL49_SCD_QUEUE_STATUS_BITS(txq_id),
758 (0 << IWL49_SCD_QUEUE_STTS_REG_POS_ACTIVE)| 758 (0 << IL49_SCD_QUEUE_STTS_REG_POS_ACTIVE)|
759 (1 << IWL49_SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN)); 759 (1 << IL49_SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN));
760} 760}
761 761
762/** 762/**
@@ -772,7 +772,7 @@ static int il4965_tx_queue_set_q2ratid(struct il_priv *il, u16 ra_tid,
772 scd_q2ratid = ra_tid & IL_SCD_QUEUE_RA_TID_MAP_RATID_MSK; 772 scd_q2ratid = ra_tid & IL_SCD_QUEUE_RA_TID_MAP_RATID_MSK;
773 773
774 tbl_dw_addr = il->scd_base_addr + 774 tbl_dw_addr = il->scd_base_addr +
775 IWL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(txq_id); 775 IL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(txq_id);
776 776
777 tbl_dw = il_read_targ_mem(il, tbl_dw_addr); 777 tbl_dw = il_read_targ_mem(il, tbl_dw_addr);
778 778
@@ -789,7 +789,7 @@ static int il4965_tx_queue_set_q2ratid(struct il_priv *il, u16 ra_tid,
789/** 789/**
790 * il4965_tx_queue_agg_enable - Set up & enable aggregation for selected queue 790 * il4965_tx_queue_agg_enable - Set up & enable aggregation for selected queue
791 * 791 *
792 * NOTE: txq_id must be greater than IWL49_FIRST_AMPDU_QUEUE, 792 * NOTE: txq_id must be greater than IL49_FIRST_AMPDU_QUEUE,
793 * i.e. it must be one of the higher queues used for aggregation 793 * i.e. it must be one of the higher queues used for aggregation
794 */ 794 */
795static int il4965_txq_agg_enable(struct il_priv *il, int txq_id, 795static int il4965_txq_agg_enable(struct il_priv *il, int txq_id,
@@ -799,13 +799,13 @@ static int il4965_txq_agg_enable(struct il_priv *il, int txq_id,
799 u16 ra_tid; 799 u16 ra_tid;
800 int ret; 800 int ret;
801 801
802 if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) || 802 if ((IL49_FIRST_AMPDU_QUEUE > txq_id) ||
803 (IWL49_FIRST_AMPDU_QUEUE + 803 (IL49_FIRST_AMPDU_QUEUE +
804 il->cfg->base_params->num_of_ampdu_queues <= txq_id)) { 804 il->cfg->base_params->num_of_ampdu_queues <= txq_id)) {
805 IL_WARN( 805 IL_WARN(
806 "queue number out of range: %d, must be %d to %d\n", 806 "queue number out of range: %d, must be %d to %d\n",
807 txq_id, IWL49_FIRST_AMPDU_QUEUE, 807 txq_id, IL49_FIRST_AMPDU_QUEUE,
808 IWL49_FIRST_AMPDU_QUEUE + 808 IL49_FIRST_AMPDU_QUEUE +
809 il->cfg->base_params->num_of_ampdu_queues - 1); 809 il->cfg->base_params->num_of_ampdu_queues - 1);
810 return -EINVAL; 810 return -EINVAL;
811 } 811 }
@@ -826,7 +826,7 @@ static int il4965_txq_agg_enable(struct il_priv *il, int txq_id,
826 il4965_tx_queue_set_q2ratid(il, ra_tid, txq_id); 826 il4965_tx_queue_set_q2ratid(il, ra_tid, txq_id);
827 827
828 /* Set this queue as a chain-building queue */ 828 /* Set this queue as a chain-building queue */
829 il_set_bits_prph(il, IWL49_SCD_QUEUECHAIN_SEL, (1 << txq_id)); 829 il_set_bits_prph(il, IL49_SCD_QUEUECHAIN_SEL, (1 << txq_id));
830 830
831 /* Place first TFD at index corresponding to start sequence number. 831 /* Place first TFD at index corresponding to start sequence number.
832 * Assumes that ssn_idx is valid (!= 0xFFF) */ 832 * Assumes that ssn_idx is valid (!= 0xFFF) */
@@ -836,16 +836,16 @@ static int il4965_txq_agg_enable(struct il_priv *il, int txq_id,
836 836
837 /* Set up Tx window size and frame limit for this queue */ 837 /* Set up Tx window size and frame limit for this queue */
838 il_write_targ_mem(il, 838 il_write_targ_mem(il,
839 il->scd_base_addr + IWL49_SCD_CONTEXT_QUEUE_OFFSET(txq_id), 839 il->scd_base_addr + IL49_SCD_CONTEXT_QUEUE_OFFSET(txq_id),
840 (SCD_WIN_SIZE << IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS) & 840 (SCD_WIN_SIZE << IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS) &
841 IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK); 841 IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK);
842 842
843 il_write_targ_mem(il, il->scd_base_addr + 843 il_write_targ_mem(il, il->scd_base_addr +
844 IWL49_SCD_CONTEXT_QUEUE_OFFSET(txq_id) + sizeof(u32), 844 IL49_SCD_CONTEXT_QUEUE_OFFSET(txq_id) + sizeof(u32),
845 (SCD_FRAME_LIMIT << IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) 845 (SCD_FRAME_LIMIT << IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS)
846 & IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK); 846 & IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK);
847 847
848 il_set_bits_prph(il, IWL49_SCD_INTERRUPT_MASK, (1 << txq_id)); 848 il_set_bits_prph(il, IL49_SCD_INTERRUPT_MASK, (1 << txq_id));
849 849
850 /* Set up Status area in SRAM, map to Tx DMA/FIFO, activate the queue */ 850 /* Set up Status area in SRAM, map to Tx DMA/FIFO, activate the queue */
851 il4965_tx_queue_set_status(il, &il->txq[txq_id], tx_fifo, 1); 851 il4965_tx_queue_set_status(il, &il->txq[txq_id], tx_fifo, 1);
@@ -922,19 +922,19 @@ int il4965_tx_agg_start(struct il_priv *il, struct ieee80211_vif *vif,
922} 922}
923 923
924/** 924/**
925 * txq_id must be greater than IWL49_FIRST_AMPDU_QUEUE 925 * txq_id must be greater than IL49_FIRST_AMPDU_QUEUE
926 * il->lock must be held by the caller 926 * il->lock must be held by the caller
927 */ 927 */
928static int il4965_txq_agg_disable(struct il_priv *il, u16 txq_id, 928static int il4965_txq_agg_disable(struct il_priv *il, u16 txq_id,
929 u16 ssn_idx, u8 tx_fifo) 929 u16 ssn_idx, u8 tx_fifo)
930{ 930{
931 if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) || 931 if ((IL49_FIRST_AMPDU_QUEUE > txq_id) ||
932 (IWL49_FIRST_AMPDU_QUEUE + 932 (IL49_FIRST_AMPDU_QUEUE +
933 il->cfg->base_params->num_of_ampdu_queues <= txq_id)) { 933 il->cfg->base_params->num_of_ampdu_queues <= txq_id)) {
934 IL_WARN( 934 IL_WARN(
935 "queue number out of range: %d, must be %d to %d\n", 935 "queue number out of range: %d, must be %d to %d\n",
936 txq_id, IWL49_FIRST_AMPDU_QUEUE, 936 txq_id, IL49_FIRST_AMPDU_QUEUE,
937 IWL49_FIRST_AMPDU_QUEUE + 937 IL49_FIRST_AMPDU_QUEUE +
938 il->cfg->base_params->num_of_ampdu_queues - 1); 938 il->cfg->base_params->num_of_ampdu_queues - 1);
939 return -EINVAL; 939 return -EINVAL;
940 } 940 }
@@ -942,7 +942,7 @@ static int il4965_txq_agg_disable(struct il_priv *il, u16 txq_id,
942 il4965_tx_queue_stop_scheduler(il, txq_id); 942 il4965_tx_queue_stop_scheduler(il, txq_id);
943 943
944 il_clear_bits_prph(il, 944 il_clear_bits_prph(il,
945 IWL49_SCD_QUEUECHAIN_SEL, (1 << txq_id)); 945 IL49_SCD_QUEUECHAIN_SEL, (1 << txq_id));
946 946
947 il->txq[txq_id].q.read_ptr = (ssn_idx & 0xff); 947 il->txq[txq_id].q.read_ptr = (ssn_idx & 0xff);
948 il->txq[txq_id].q.write_ptr = (ssn_idx & 0xff); 948 il->txq[txq_id].q.write_ptr = (ssn_idx & 0xff);
@@ -950,7 +950,7 @@ static int il4965_txq_agg_disable(struct il_priv *il, u16 txq_id,
950 il4965_set_wr_ptrs(il, txq_id, ssn_idx); 950 il4965_set_wr_ptrs(il, txq_id, ssn_idx);
951 951
952 il_clear_bits_prph(il, 952 il_clear_bits_prph(il,
953 IWL49_SCD_INTERRUPT_MASK, (1 << txq_id)); 953 IL49_SCD_INTERRUPT_MASK, (1 << txq_id));
954 il_txq_ctx_deactivate(il, txq_id); 954 il_txq_ctx_deactivate(il, txq_id);
955 il4965_tx_queue_set_status(il, &il->txq[txq_id], tx_fifo, 0); 955 il4965_tx_queue_set_status(il, &il->txq[txq_id], tx_fifo, 0);
956 956
@@ -1134,7 +1134,7 @@ int il4965_tx_queue_reclaim(struct il_priv *il, int txq_id, int index)
1134 nfreed++; 1134 nfreed++;
1135 1135
1136 il4965_tx_status(il, tx_info, 1136 il4965_tx_status(il, tx_info,
1137 txq_id >= IWL4965_FIRST_AMPDU_QUEUE); 1137 txq_id >= IL4965_FIRST_AMPDU_QUEUE);
1138 tx_info->skb = NULL; 1138 tx_info->skb = NULL;
1139 1139
1140 il->cfg->ops->lib->txq_free_tfd(il, txq); 1140 il->cfg->ops->lib->txq_free_tfd(il, txq);
@@ -1331,7 +1331,7 @@ void il4965_rx_reply_compressed_ba(struct il_priv *il,
1331 spin_unlock_irqrestore(&il->sta_lock, flags); 1331 spin_unlock_irqrestore(&il->sta_lock, flags);
1332} 1332}
1333 1333
1334#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 1334#ifdef CONFIG_IWLEGACY_DEBUG
1335const char *il4965_get_tx_fail_reason(u32 status) 1335const char *il4965_get_tx_fail_reason(u32 status)
1336{ 1336{
1337#define TX_STATUS_FAIL(x) case TX_STATUS_FAIL_ ## x: return #x 1337#define TX_STATUS_FAIL(x) case TX_STATUS_FAIL_ ## x: return #x
@@ -1368,4 +1368,4 @@ const char *il4965_get_tx_fail_reason(u32 status)
1368#undef TX_STATUS_FAIL 1368#undef TX_STATUS_FAIL
1369#undef TX_STATUS_POSTPONE 1369#undef TX_STATUS_POSTPONE
1370} 1370}
1371#endif /* CONFIG_IWLWIFI_LEGACY_DEBUG */ 1371#endif /* CONFIG_IWLEGACY_DEBUG */
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-ucode.c b/drivers/net/wireless/iwlegacy/iwl-4965-ucode.c
index bb0b7f5cb5ee..633caf5f60fc 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-ucode.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-ucode.c
@@ -62,7 +62,7 @@ il4965_verify_inst_sparse(struct il_priv *il, __le32 *image, u32 len)
62 /* NOTE: Use the debugless read so we don't flood kernel log 62 /* NOTE: Use the debugless read so we don't flood kernel log
63 * if IL_DL_IO is set */ 63 * if IL_DL_IO is set */
64 il_wr(il, HBUS_TARG_MEM_RADDR, 64 il_wr(il, HBUS_TARG_MEM_RADDR,
65 i + IWL4965_RTC_INST_LOWER_BOUND); 65 i + IL4965_RTC_INST_LOWER_BOUND);
66 val = _il_rd(il, HBUS_TARG_MEM_RDAT); 66 val = _il_rd(il, HBUS_TARG_MEM_RDAT);
67 if (val != le32_to_cpu(*image)) { 67 if (val != le32_to_cpu(*image)) {
68 ret = -EIO; 68 ret = -EIO;
@@ -90,7 +90,7 @@ static int il4965_verify_inst_full(struct il_priv *il, __le32 *image,
90 D_INFO("ucode inst image size is %u\n", len); 90 D_INFO("ucode inst image size is %u\n", len);
91 91
92 il_wr(il, HBUS_TARG_MEM_RADDR, 92 il_wr(il, HBUS_TARG_MEM_RADDR,
93 IWL4965_RTC_INST_LOWER_BOUND); 93 IL4965_RTC_INST_LOWER_BOUND);
94 94
95 errcnt = 0; 95 errcnt = 0;
96 for (; len > 0; len -= sizeof(u32), image++) { 96 for (; len > 0; len -= sizeof(u32), image++) {
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965.c b/drivers/net/wireless/iwlegacy/iwl-4965.c
index 3706e47ce274..f3451714249b 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965.c
@@ -52,14 +52,14 @@ static int il4965_send_tx_power(struct il_priv *il);
52static int il4965_hw_get_temperature(struct il_priv *il); 52static int il4965_hw_get_temperature(struct il_priv *il);
53 53
54/* Highest firmware API version supported */ 54/* Highest firmware API version supported */
55#define IWL4965_UCODE_API_MAX 2 55#define IL4965_UCODE_API_MAX 2
56 56
57/* Lowest firmware API version supported */ 57/* Lowest firmware API version supported */
58#define IWL4965_UCODE_API_MIN 2 58#define IL4965_UCODE_API_MIN 2
59 59
60#define IWL4965_FW_PRE "iwlwifi-4965-" 60#define IL4965_FW_PRE "iwlwifi-4965-"
61#define _IWL4965_MODULE_FIRMWARE(api) IWL4965_FW_PRE #api ".ucode" 61#define _IL4965_MODULE_FIRMWARE(api) IL4965_FW_PRE #api ".ucode"
62#define IWL4965_MODULE_FIRMWARE(api) _IWL4965_MODULE_FIRMWARE(api) 62#define IL4965_MODULE_FIRMWARE(api) _IL4965_MODULE_FIRMWARE(api)
63 63
64/* check contents of special bootstrap uCode SRAM */ 64/* check contents of special bootstrap uCode SRAM */
65static int il4965_verify_bsm(struct il_priv *il) 65static int il4965_verify_bsm(struct il_priv *il)
@@ -142,7 +142,7 @@ static int il4965_load_bsm(struct il_priv *il)
142 il->ucode_type = UCODE_RT; 142 il->ucode_type = UCODE_RT;
143 143
144 /* make sure bootstrap program is no larger than BSM's SRAM size */ 144 /* make sure bootstrap program is no larger than BSM's SRAM size */
145 if (len > IWL49_MAX_BSM_SIZE) 145 if (len > IL49_MAX_BSM_SIZE)
146 return -EINVAL; 146 return -EINVAL;
147 147
148 /* Tell bootstrap uCode where to find the "Initialize" uCode 148 /* Tell bootstrap uCode where to find the "Initialize" uCode
@@ -174,7 +174,7 @@ static int il4965_load_bsm(struct il_priv *il)
174 /* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */ 174 /* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */
175 il_wr_prph(il, BSM_WR_MEM_SRC_REG, 0x0); 175 il_wr_prph(il, BSM_WR_MEM_SRC_REG, 0x0);
176 il_wr_prph(il, 176 il_wr_prph(il,
177 BSM_WR_MEM_DST_REG, IWL49_RTC_INST_LOWER_BOUND); 177 BSM_WR_MEM_DST_REG, IL49_RTC_INST_LOWER_BOUND);
178 il_wr_prph(il, BSM_WR_DWCOUNT_REG, len / sizeof(u32)); 178 il_wr_prph(il, BSM_WR_DWCOUNT_REG, len / sizeof(u32));
179 179
180 /* Load bootstrap code into instruction SRAM now, 180 /* Load bootstrap code into instruction SRAM now,
@@ -392,7 +392,7 @@ static void il4965_set_ct_threshold(struct il_priv *il)
392static int il4965_hw_set_hw_params(struct il_priv *il) 392static int il4965_hw_set_hw_params(struct il_priv *il)
393{ 393{
394 if (il->cfg->mod_params->num_of_queues >= IL_MIN_NUM_QUEUES && 394 if (il->cfg->mod_params->num_of_queues >= IL_MIN_NUM_QUEUES &&
395 il->cfg->mod_params->num_of_queues <= IWL49_NUM_QUEUES) 395 il->cfg->mod_params->num_of_queues <= IL49_NUM_QUEUES)
396 il->cfg->base_params->num_of_queues = 396 il->cfg->base_params->num_of_queues =
397 il->cfg->mod_params->num_of_queues; 397 il->cfg->mod_params->num_of_queues;
398 398
@@ -402,10 +402,10 @@ static int il4965_hw_set_hw_params(struct il_priv *il)
402 il->cfg->base_params->num_of_queues * 402 il->cfg->base_params->num_of_queues *
403 sizeof(struct il4965_scd_bc_tbl); 403 sizeof(struct il4965_scd_bc_tbl);
404 il->hw_params.tfd_size = sizeof(struct il_tfd); 404 il->hw_params.tfd_size = sizeof(struct il_tfd);
405 il->hw_params.max_stations = IWL4965_STATION_COUNT; 405 il->hw_params.max_stations = IL4965_STATION_COUNT;
406 il->contexts[IL_RXON_CTX_BSS].bcast_sta_id = IWL4965_BROADCAST_ID; 406 il->contexts[IL_RXON_CTX_BSS].bcast_sta_id = IL4965_BROADCAST_ID;
407 il->hw_params.max_data_size = IWL49_RTC_DATA_SIZE; 407 il->hw_params.max_data_size = IL49_RTC_DATA_SIZE;
408 il->hw_params.max_inst_size = IWL49_RTC_INST_SIZE; 408 il->hw_params.max_inst_size = IL49_RTC_INST_SIZE;
409 il->hw_params.max_bsm_size = BSM_SRAM_SIZE; 409 il->hw_params.max_bsm_size = BSM_SRAM_SIZE;
410 il->hw_params.ht40_channel = BIT(IEEE80211_BAND_5GHZ); 410 il->hw_params.ht40_channel = BIT(IEEE80211_BAND_5GHZ);
411 411
@@ -419,7 +419,7 @@ static int il4965_hw_set_hw_params(struct il_priv *il)
419 il4965_set_ct_threshold(il); 419 il4965_set_ct_threshold(il);
420 420
421 il->hw_params.sens = &il4965_sensitivity; 421 il->hw_params.sens = &il4965_sensitivity;
422 il->hw_params.beacon_time_tsf_bits = IWL4965_EXT_BEACON_TIME_POS; 422 il->hw_params.beacon_time_tsf_bits = IL4965_EXT_BEACON_TIME_POS;
423 423
424 return 0; 424 return 0;
425} 425}
@@ -2143,14 +2143,14 @@ static const struct il_ops il4965_ops = {
2143}; 2143};
2144 2144
2145static struct il_base_params il4965_base_params = { 2145static struct il_base_params il4965_base_params = {
2146 .eeprom_size = IWL4965_EEPROM_IMG_SIZE, 2146 .eeprom_size = IL4965_EEPROM_IMG_SIZE,
2147 .num_of_queues = IWL49_NUM_QUEUES, 2147 .num_of_queues = IL49_NUM_QUEUES,
2148 .num_of_ampdu_queues = IWL49_NUM_AMPDU_QUEUES, 2148 .num_of_ampdu_queues = IL49_NUM_AMPDU_QUEUES,
2149 .pll_cfg_val = 0, 2149 .pll_cfg_val = 0,
2150 .set_l0s = true, 2150 .set_l0s = true,
2151 .use_bsm = true, 2151 .use_bsm = true,
2152 .led_compensation = 61, 2152 .led_compensation = 61,
2153 .chain_noise_num_beacons = IWL4965_CAL_NUM_BEACONS, 2153 .chain_noise_num_beacons = IL4965_CAL_NUM_BEACONS,
2154 .wd_timeout = IL_DEF_WD_TIMEOUT, 2154 .wd_timeout = IL_DEF_WD_TIMEOUT,
2155 .temperature_kelvin = true, 2155 .temperature_kelvin = true,
2156 .ucode_tracing = true, 2156 .ucode_tracing = true,
@@ -2160,9 +2160,9 @@ static struct il_base_params il4965_base_params = {
2160 2160
2161struct il_cfg il4965_cfg = { 2161struct il_cfg il4965_cfg = {
2162 .name = "Intel(R) Wireless WiFi Link 4965AGN", 2162 .name = "Intel(R) Wireless WiFi Link 4965AGN",
2163 .fw_name_pre = IWL4965_FW_PRE, 2163 .fw_name_pre = IL4965_FW_PRE,
2164 .ucode_api_max = IWL4965_UCODE_API_MAX, 2164 .ucode_api_max = IL4965_UCODE_API_MAX,
2165 .ucode_api_min = IWL4965_UCODE_API_MIN, 2165 .ucode_api_min = IL4965_UCODE_API_MIN,
2166 .sku = IL_SKU_A|IL_SKU_G|IL_SKU_N, 2166 .sku = IL_SKU_A|IL_SKU_G|IL_SKU_N,
2167 .valid_tx_ant = ANT_AB, 2167 .valid_tx_ant = ANT_AB,
2168 .valid_rx_ant = ANT_ABC, 2168 .valid_rx_ant = ANT_ABC,
@@ -2180,4 +2180,4 @@ struct il_cfg il4965_cfg = {
2180}; 2180};
2181 2181
2182/* Module firmware */ 2182/* Module firmware */
2183MODULE_FIRMWARE(IWL4965_MODULE_FIRMWARE(IWL4965_UCODE_API_MAX)); 2183MODULE_FIRMWARE(IL4965_MODULE_FIRMWARE(IL4965_UCODE_API_MAX));
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965.h b/drivers/net/wireless/iwlegacy/iwl-4965.h
index 56bfdb016040..0b92c28a8f2a 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965.h
+++ b/drivers/net/wireless/iwlegacy/iwl-4965.h
@@ -189,7 +189,7 @@ int il4965_manage_ibss_station(struct il_priv *il,
189/* hcmd */ 189/* hcmd */
190int il4965_send_beacon_cmd(struct il_priv *il); 190int il4965_send_beacon_cmd(struct il_priv *il);
191 191
192#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 192#ifdef CONFIG_IWLEGACY_DEBUG
193const char *il4965_get_tx_fail_reason(u32 status); 193const char *il4965_get_tx_fail_reason(u32 status);
194#else 194#else
195static inline const char * 195static inline const char *
diff --git a/drivers/net/wireless/iwlegacy/iwl-commands.h b/drivers/net/wireless/iwlegacy/iwl-commands.h
index 347d40284309..61acafbaab31 100644
--- a/drivers/net/wireless/iwlegacy/iwl-commands.h
+++ b/drivers/net/wireless/iwlegacy/iwl-commands.h
@@ -746,7 +746,7 @@ struct il4965_rxon_assoc_cmd {
746 746
747#define IL_CONN_MAX_LISTEN_INTERVAL 10 747#define IL_CONN_MAX_LISTEN_INTERVAL 10
748#define IL_MAX_UCODE_BEACON_INTERVAL 4 /* 4096 */ 748#define IL_MAX_UCODE_BEACON_INTERVAL 4 /* 4096 */
749#define IWL39_MAX_UCODE_BEACON_INTERVAL 1 /* 1024 */ 749#define IL39_MAX_UCODE_BEACON_INTERVAL 1 /* 1024 */
750 750
751/* 751/*
752 * REPLY_RXON_TIMING = 0x14 (command, has simple generic response) 752 * REPLY_RXON_TIMING = 0x14 (command, has simple generic response)
@@ -854,10 +854,10 @@ struct il_qosparam_cmd {
854/* Special, dedicated locations within device's station table */ 854/* Special, dedicated locations within device's station table */
855#define IL_AP_ID 0 855#define IL_AP_ID 0
856#define IL_STA_ID 2 856#define IL_STA_ID 2
857#define IWL3945_BROADCAST_ID 24 857#define IL3945_BROADCAST_ID 24
858#define IWL3945_STATION_COUNT 25 858#define IL3945_STATION_COUNT 25
859#define IWL4965_BROADCAST_ID 31 859#define IL4965_BROADCAST_ID 31
860#define IWL4965_STATION_COUNT 32 860#define IL4965_STATION_COUNT 32
861 861
862#define IL_STATION_COUNT 32 /* MAX(3945,4965)*/ 862#define IL_STATION_COUNT 32 /* MAX(3945,4965)*/
863#define IL_INVALID_STATION 255 863#define IL_INVALID_STATION 255
@@ -1208,15 +1208,15 @@ struct il3945_rx_frame {
1208 struct il3945_rx_frame_end end; 1208 struct il3945_rx_frame_end end;
1209} __packed; 1209} __packed;
1210 1210
1211#define IWL39_RX_FRAME_SIZE (4 + sizeof(struct il3945_rx_frame)) 1211#define IL39_RX_FRAME_SIZE (4 + sizeof(struct il3945_rx_frame))
1212 1212
1213/* Fixed (non-configurable) rx data from phy */ 1213/* Fixed (non-configurable) rx data from phy */
1214 1214
1215#define IWL49_RX_RES_PHY_CNT 14 1215#define IL49_RX_RES_PHY_CNT 14
1216#define IWL49_RX_PHY_FLAGS_ANTENNAE_OFFSET (4) 1216#define IL49_RX_PHY_FLAGS_ANTENNAE_OFFSET (4)
1217#define IWL49_RX_PHY_FLAGS_ANTENNAE_MASK (0x70) 1217#define IL49_RX_PHY_FLAGS_ANTENNAE_MASK (0x70)
1218#define IWL49_AGC_DB_MASK (0x3f80) /* MASK(7,13) */ 1218#define IL49_AGC_DB_MASK (0x3f80) /* MASK(7,13) */
1219#define IWL49_AGC_DB_POS (7) 1219#define IL49_AGC_DB_POS (7)
1220struct il4965_rx_non_cfg_phy { 1220struct il4965_rx_non_cfg_phy {
1221 __le16 ant_selection; /* ant A bit 4, ant B bit 5, ant C bit 6 */ 1221 __le16 ant_selection; /* ant A bit 4, ant B bit 5, ant C bit 6 */
1222 __le16 agc_info; /* agc code 0:6, agc dB 7:13, reserved 14:15 */ 1222 __le16 agc_info; /* agc code 0:6, agc dB 7:13, reserved 14:15 */
@@ -2407,7 +2407,7 @@ struct il3945_scan_channel {
2407} __packed; 2407} __packed;
2408 2408
2409/* set number of direct probes u8 type */ 2409/* set number of direct probes u8 type */
2410#define IWL39_SCAN_PROBE_MASK(n) ((BIT(n) | (BIT(n) - BIT(1)))) 2410#define IL39_SCAN_PROBE_MASK(n) ((BIT(n) | (BIT(n) - BIT(1))))
2411 2411
2412struct il_scan_channel { 2412struct il_scan_channel {
2413 /* 2413 /*
diff --git a/drivers/net/wireless/iwlegacy/iwl-core.c b/drivers/net/wireless/iwlegacy/iwl-core.c
index acbd5a899565..395918e2d726 100644
--- a/drivers/net/wireless/iwlegacy/iwl-core.c
+++ b/drivers/net/wireless/iwlegacy/iwl-core.c
@@ -315,7 +315,7 @@ bool il_is_ht40_tx_allowed(struct il_priv *il,
315 if (ht_cap && !ht_cap->ht_supported) 315 if (ht_cap && !ht_cap->ht_supported)
316 return false; 316 return false;
317 317
318#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 318#ifdef CONFIG_IWLEGACY_DEBUGFS
319 if (il->disable_ht40) 319 if (il->disable_ht40)
320 return false; 320 return false;
321#endif 321#endif
@@ -888,7 +888,7 @@ void il_rx_csa(struct il_priv *il, struct il_rx_mem_buffer *rxb)
888} 888}
889EXPORT_SYMBOL(il_rx_csa); 889EXPORT_SYMBOL(il_rx_csa);
890 890
891#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 891#ifdef CONFIG_IWLEGACY_DEBUG
892void il_print_rx_config_cmd(struct il_priv *il, 892void il_print_rx_config_cmd(struct il_priv *il,
893 struct il_rxon_context *ctx) 893 struct il_rxon_context *ctx)
894{ 894{
@@ -930,7 +930,7 @@ void il_irq_handle_error(struct il_priv *il)
930 il->cfg->ops->lib->dump_nic_error_log(il); 930 il->cfg->ops->lib->dump_nic_error_log(il);
931 if (il->cfg->ops->lib->dump_fh) 931 if (il->cfg->ops->lib->dump_fh)
932 il->cfg->ops->lib->dump_fh(il, NULL, false); 932 il->cfg->ops->lib->dump_fh(il, NULL, false);
933#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 933#ifdef CONFIG_IWLEGACY_DEBUG
934 if (il_get_debug_level(il) & IL_DL_FW_ERRORS) 934 if (il_get_debug_level(il) & IL_DL_FW_ERRORS)
935 il_print_rx_config_cmd(il, 935 il_print_rx_config_cmd(il,
936 &il->contexts[IL_RXON_CTX_BSS]); 936 &il->contexts[IL_RXON_CTX_BSS]);
@@ -1208,7 +1208,7 @@ EXPORT_SYMBOL(il_send_statistics_request);
1208void il_rx_pm_sleep_notif(struct il_priv *il, 1208void il_rx_pm_sleep_notif(struct il_priv *il,
1209 struct il_rx_mem_buffer *rxb) 1209 struct il_rx_mem_buffer *rxb)
1210{ 1210{
1211#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 1211#ifdef CONFIG_IWLEGACY_DEBUG
1212 struct il_rx_packet *pkt = rxb_addr(rxb); 1212 struct il_rx_packet *pkt = rxb_addr(rxb);
1213 struct il_sleep_notification *sleep = &(pkt->u.sleep_notif); 1213 struct il_sleep_notification *sleep = &(pkt->u.sleep_notif);
1214 D_RX("sleep mode: %d, src: %d\n", 1214 D_RX("sleep mode: %d, src: %d\n",
@@ -1467,7 +1467,7 @@ void il_txq_mem(struct il_priv *il)
1467} 1467}
1468EXPORT_SYMBOL(il_txq_mem); 1468EXPORT_SYMBOL(il_txq_mem);
1469 1469
1470#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 1470#ifdef CONFIG_IWLEGACY_DEBUGFS
1471 1471
1472#define IL_TRAFFIC_DUMP_SIZE (IL_TRAFFIC_ENTRY_SIZE * IL_TRAFFIC_ENTRIES) 1472#define IL_TRAFFIC_DUMP_SIZE (IL_TRAFFIC_ENTRY_SIZE * IL_TRAFFIC_ENTRIES)
1473 1473
@@ -1611,11 +1611,11 @@ void il_clear_traffic_stats(struct il_priv *il)
1611} 1611}
1612 1612
1613/* 1613/*
1614 * if CONFIG_IWLWIFI_LEGACY_DEBUGFS defined, 1614 * if CONFIG_IWLEGACY_DEBUGFS defined,
1615 * il_update_stats function will 1615 * il_update_stats function will
1616 * record all the MGMT, CTRL and DATA pkt for both TX and Rx pass 1616 * record all the MGMT, CTRL and DATA pkt for both TX and Rx pass
1617 * Use debugFs to display the rx/rx_statistics 1617 * Use debugFs to display the rx/rx_statistics
1618 * if CONFIG_IWLWIFI_LEGACY_DEBUGFS not being defined, then no MGMT and CTRL 1618 * if CONFIG_IWLEGACY_DEBUGFS not being defined, then no MGMT and CTRL
1619 * information will be recorded, but DATA pkt still will be recorded 1619 * information will be recorded, but DATA pkt still will be recorded
1620 * for the reason of il_led.c need to control the led blinking based on 1620 * for the reason of il_led.c need to control the led blinking based on
1621 * number of tx and rx data. 1621 * number of tx and rx data.
diff --git a/drivers/net/wireless/iwlegacy/iwl-core.h b/drivers/net/wireless/iwlegacy/iwl-core.h
index 1803954cbc5a..487cebfb6ed0 100644
--- a/drivers/net/wireless/iwlegacy/iwl-core.h
+++ b/drivers/net/wireless/iwlegacy/iwl-core.h
@@ -329,7 +329,7 @@ int il_mac_change_interface(struct ieee80211_hw *hw,
329int il_alloc_txq_mem(struct il_priv *il); 329int il_alloc_txq_mem(struct il_priv *il);
330void il_txq_mem(struct il_priv *il); 330void il_txq_mem(struct il_priv *il);
331 331
332#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 332#ifdef CONFIG_IWLEGACY_DEBUGFS
333int il_alloc_traffic_mem(struct il_priv *il); 333int il_alloc_traffic_mem(struct il_priv *il);
334void il_free_traffic_mem(struct il_priv *il); 334void il_free_traffic_mem(struct il_priv *il);
335void il_reset_traffic_log(struct il_priv *il); 335void il_reset_traffic_log(struct il_priv *il);
@@ -513,7 +513,7 @@ extern const struct dev_pm_ops il_pm_ops;
513* Error Handling Debugging 513* Error Handling Debugging
514******************************************************/ 514******************************************************/
515void il4965_dump_nic_error_log(struct il_priv *il); 515void il4965_dump_nic_error_log(struct il_priv *il);
516#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 516#ifdef CONFIG_IWLEGACY_DEBUG
517void il_print_rx_config_cmd(struct il_priv *il, 517void il_print_rx_config_cmd(struct il_priv *il,
518 struct il_rxon_context *ctx); 518 struct il_rxon_context *ctx);
519#else 519#else
diff --git a/drivers/net/wireless/iwlegacy/iwl-debug.h b/drivers/net/wireless/iwlegacy/iwl-debug.h
index 77467de7e028..c58003aa8185 100644
--- a/drivers/net/wireless/iwlegacy/iwl-debug.h
+++ b/drivers/net/wireless/iwlegacy/iwl-debug.h
@@ -42,7 +42,7 @@ do { \
42 DUMP_PREFIX_OFFSET, 16, 1, p, len, 1); \ 42 DUMP_PREFIX_OFFSET, 16, 1, p, len, 1); \
43} while (0) 43} while (0)
44 44
45#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 45#ifdef CONFIG_IWLEGACY_DEBUG
46#define IL_DBG(level, fmt, args...) \ 46#define IL_DBG(level, fmt, args...) \
47do { \ 47do { \
48 if (il_get_debug_level(il) & level) \ 48 if (il_get_debug_level(il) & level) \
@@ -63,9 +63,9 @@ do { \
63static inline void il_print_hex_dump(struct il_priv *il, int level, 63static inline void il_print_hex_dump(struct il_priv *il, int level,
64 const void *p, u32 len) 64 const void *p, u32 len)
65{} 65{}
66#endif /* CONFIG_IWLWIFI_LEGACY_DEBUG */ 66#endif /* CONFIG_IWLEGACY_DEBUG */
67 67
68#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 68#ifdef CONFIG_IWLEGACY_DEBUGFS
69int il_dbgfs_register(struct il_priv *il, const char *name); 69int il_dbgfs_register(struct il_priv *il, const char *name);
70void il_dbgfs_unregister(struct il_priv *il); 70void il_dbgfs_unregister(struct il_priv *il);
71#else 71#else
@@ -77,7 +77,7 @@ il_dbgfs_register(struct il_priv *il, const char *name)
77static inline void il_dbgfs_unregister(struct il_priv *il) 77static inline void il_dbgfs_unregister(struct il_priv *il)
78{ 78{
79} 79}
80#endif /* CONFIG_IWLWIFI_LEGACY_DEBUGFS */ 80#endif /* CONFIG_IWLEGACY_DEBUGFS */
81 81
82/* 82/*
83 * To use the debug system: 83 * To use the debug system:
@@ -99,7 +99,7 @@ static inline void il_dbgfs_unregister(struct il_priv *il)
99 * /sys/module/iwl3945/parameters/debug 99 * /sys/module/iwl3945/parameters/debug
100 * /sys/class/net/wlan0/device/debug_level 100 * /sys/class/net/wlan0/device/debug_level
101 * 101 *
102 * when CONFIG_IWLWIFI_LEGACY_DEBUG=y. 102 * when CONFIG_IWLEGACY_DEBUG=y.
103 */ 103 */
104 104
105/* 0x0000000F - 0x00000001 */ 105/* 0x0000000F - 0x00000001 */
diff --git a/drivers/net/wireless/iwlegacy/iwl-debugfs.c b/drivers/net/wireless/iwlegacy/iwl-debugfs.c
index cd15e67c94d3..736b00bc7bfb 100644
--- a/drivers/net/wireless/iwlegacy/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlegacy/iwl-debugfs.c
@@ -535,7 +535,7 @@ static ssize_t il_dbgfs_interrupt_read(struct file *file,
535 "\tLast Restarting Code: 0x%X\n", 535 "\tLast Restarting Code: 0x%X\n",
536 il->isr_stats.err_code); 536 il->isr_stats.err_code);
537 } 537 }
538#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 538#ifdef CONFIG_IWLEGACY_DEBUG
539 pos += scnprintf(buf + pos, bufsz - pos, "Frame transmitted:\t\t %u\n", 539 pos += scnprintf(buf + pos, bufsz - pos, "Frame transmitted:\t\t %u\n",
540 il->isr_stats.sch); 540 il->isr_stats.sch);
541 pos += scnprintf(buf + pos, bufsz - pos, "Alive interrupt:\t\t %u\n", 541 pos += scnprintf(buf + pos, bufsz - pos, "Alive interrupt:\t\t %u\n",
diff --git a/drivers/net/wireless/iwlegacy/iwl-dev.h b/drivers/net/wireless/iwlegacy/iwl-dev.h
index 2e2e3f3f66f7..0aa4a120e87c 100644
--- a/drivers/net/wireless/iwlegacy/iwl-dev.h
+++ b/drivers/net/wireless/iwlegacy/iwl-dev.h
@@ -185,7 +185,7 @@ struct il4965_channel_tgh_info {
185 s64 last_radar_time; 185 s64 last_radar_time;
186}; 186};
187 187
188#define IWL4965_MAX_RATE (33) 188#define IL4965_MAX_RATE (33)
189 189
190struct il3945_clip_group { 190struct il3945_clip_group {
191 /* maximum power level to prevent clipping for each rate, derived by 191 /* maximum power level to prevent clipping for each rate, derived by
@@ -246,7 +246,7 @@ struct il_channel_info {
246 /* Radio/DSP gain settings for each "normal" data Tx rate. 246 /* Radio/DSP gain settings for each "normal" data Tx rate.
247 * These include, in addition to RF and DSP gain, a few fields for 247 * These include, in addition to RF and DSP gain, a few fields for
248 * remembering/modifying gain settings (indexes). */ 248 * remembering/modifying gain settings (indexes). */
249 struct il3945_channel_power_info power_info[IWL4965_MAX_RATE]; 249 struct il3945_channel_power_info power_info[IL4965_MAX_RATE];
250 250
251 /* Radio/DSP gain settings for each scan rate, for directed scans. */ 251 /* Radio/DSP gain settings for each scan rate, for directed scans. */
252 struct il3945_scan_power_info scan_pwr_info[IL_NUM_SCAN_RATES]; 252 struct il3945_scan_power_info scan_pwr_info[IL_NUM_SCAN_RATES];
@@ -670,7 +670,7 @@ struct il_dma_ptr {
670 670
671/* Sensitivity and chain noise calibration */ 671/* Sensitivity and chain noise calibration */
672#define INITIALIZATION_VALUE 0xFFFF 672#define INITIALIZATION_VALUE 0xFFFF
673#define IWL4965_CAL_NUM_BEACONS 20 673#define IL4965_CAL_NUM_BEACONS 20
674#define IL_CAL_NUM_BEACONS 16 674#define IL_CAL_NUM_BEACONS 16
675#define MAXIMUM_ALLOWED_PATHLOSS 15 675#define MAXIMUM_ALLOWED_PATHLOSS 15
676 676
@@ -847,7 +847,7 @@ enum il_ctrl_stats {
847}; 847};
848 848
849struct traffic_stats { 849struct traffic_stats {
850#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 850#ifdef CONFIG_IWLEGACY_DEBUGFS
851 u32 mgmt[MANAGEMENT_MAX]; 851 u32 mgmt[MANAGEMENT_MAX];
852 u32 ctrl[CONTROL_MAX]; 852 u32 ctrl[CONTROL_MAX];
853 u32 data_cnt; 853 u32 data_cnt;
@@ -891,13 +891,13 @@ struct il_force_reset {
891 * bits 31:24 - extended 891 * bits 31:24 - extended
892 * bits 23:0 - interval 892 * bits 23:0 - interval
893 */ 893 */
894#define IWL3945_EXT_BEACON_TIME_POS 24 894#define IL3945_EXT_BEACON_TIME_POS 24
895/* 895/*
896 * for _4965 devices 896 * for _4965 devices
897 * bits 31:22 - extended 897 * bits 31:22 - extended
898 * bits 21:0 - interval 898 * bits 21:0 - interval
899 */ 899 */
900#define IWL4965_EXT_BEACON_TIME_POS 22 900#define IL4965_EXT_BEACON_TIME_POS 22
901 901
902enum il_rxon_context_id { 902enum il_rxon_context_id {
903 IL_RXON_CTX_BSS, 903 IL_RXON_CTX_BSS,
@@ -1141,7 +1141,7 @@ struct il_priv {
1141 struct delayed_work rfkill_poll; 1141 struct delayed_work rfkill_poll;
1142 1142
1143 struct il3945_notif_statistics statistics; 1143 struct il3945_notif_statistics statistics;
1144#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 1144#ifdef CONFIG_IWLEGACY_DEBUGFS
1145 struct il3945_notif_statistics accum_statistics; 1145 struct il3945_notif_statistics accum_statistics;
1146 struct il3945_notif_statistics delta_statistics; 1146 struct il3945_notif_statistics delta_statistics;
1147 struct il3945_notif_statistics max_delta; 1147 struct il3945_notif_statistics max_delta;
@@ -1179,7 +1179,7 @@ struct il_priv {
1179 u8 phy_calib_chain_noise_gain_cmd; 1179 u8 phy_calib_chain_noise_gain_cmd;
1180 1180
1181 struct il_notif_statistics statistics; 1181 struct il_notif_statistics statistics;
1182#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 1182#ifdef CONFIG_IWLEGACY_DEBUGFS
1183 struct il_notif_statistics accum_statistics; 1183 struct il_notif_statistics accum_statistics;
1184 struct il_notif_statistics delta_statistics; 1184 struct il_notif_statistics delta_statistics;
1185 struct il_notif_statistics max_delta; 1185 struct il_notif_statistics max_delta;
@@ -1217,12 +1217,12 @@ struct il_priv {
1217 s8 tx_power_next; 1217 s8 tx_power_next;
1218 1218
1219 1219
1220#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 1220#ifdef CONFIG_IWLEGACY_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 il_debug_level if set */ 1223 il_debug_level if set */
1224#endif /* CONFIG_IWLWIFI_LEGACY_DEBUG */ 1224#endif /* CONFIG_IWLEGACY_DEBUG */
1225#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS 1225#ifdef CONFIG_IWLEGACY_DEBUGFS
1226 /* debugfs */ 1226 /* debugfs */
1227 u16 tx_traffic_idx; 1227 u16 tx_traffic_idx;
1228 u16 rx_traffic_idx; 1228 u16 rx_traffic_idx;
@@ -1231,7 +1231,7 @@ struct il_priv {
1231 struct dentry *debugfs_dir; 1231 struct dentry *debugfs_dir;
1232 u32 dbgfs_sram_offset, dbgfs_sram_len; 1232 u32 dbgfs_sram_offset, dbgfs_sram_len;
1233 bool disable_ht40; 1233 bool disable_ht40;
1234#endif /* CONFIG_IWLWIFI_LEGACY_DEBUGFS */ 1234#endif /* CONFIG_IWLEGACY_DEBUGFS */
1235 1235
1236 struct work_struct txpower_work; 1236 struct work_struct txpower_work;
1237 u32 disable_sens_cal; 1237 u32 disable_sens_cal;
@@ -1257,7 +1257,7 @@ static inline void il_txq_ctx_deactivate(struct il_priv *il, int txq_id)
1257 clear_bit(txq_id, &il->txq_ctx_active_msk); 1257 clear_bit(txq_id, &il->txq_ctx_active_msk);
1258} 1258}
1259 1259
1260#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 1260#ifdef CONFIG_IWLEGACY_DEBUG
1261/* 1261/*
1262 * il_get_debug_level: Return active debug level for device 1262 * il_get_debug_level: Return active debug level for device
1263 * 1263 *
diff --git a/drivers/net/wireless/iwlegacy/iwl-hcmd.c b/drivers/net/wireless/iwlegacy/iwl-hcmd.c
index 8f87bd87f63d..6ccd37fc42c1 100644
--- a/drivers/net/wireless/iwlegacy/iwl-hcmd.c
+++ b/drivers/net/wireless/iwlegacy/iwl-hcmd.c
@@ -100,7 +100,7 @@ static void il_generic_cmd_callback(struct il_priv *il,
100 return; 100 return;
101 } 101 }
102 102
103#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 103#ifdef CONFIG_IWLEGACY_DEBUG
104 switch (cmd->hdr.cmd) { 104 switch (cmd->hdr.cmd) {
105 case REPLY_TX_LINK_QUALITY_CMD: 105 case REPLY_TX_LINK_QUALITY_CMD:
106 case SENSITIVITY_CMD: 106 case SENSITIVITY_CMD:
diff --git a/drivers/net/wireless/iwlegacy/iwl-legacy-rs.h b/drivers/net/wireless/iwlegacy/iwl-legacy-rs.h
index 5da7d415170c..f24b6b847fb4 100644
--- a/drivers/net/wireless/iwlegacy/iwl-legacy-rs.h
+++ b/drivers/net/wireless/iwlegacy/iwl-legacy-rs.h
@@ -97,7 +97,7 @@ enum {
97 97
98enum { 98enum {
99 IL_FIRST_OFDM_RATE = IL_RATE_6M_INDEX, 99 IL_FIRST_OFDM_RATE = IL_RATE_6M_INDEX,
100 IWL39_LAST_OFDM_RATE = IL_RATE_54M_INDEX, 100 IL39_LAST_OFDM_RATE = IL_RATE_54M_INDEX,
101 IL_LAST_OFDM_RATE = IL_RATE_60M_INDEX, 101 IL_LAST_OFDM_RATE = IL_RATE_60M_INDEX,
102 IL_FIRST_CCK_RATE = IL_RATE_1M_INDEX, 102 IL_FIRST_CCK_RATE = IL_RATE_1M_INDEX,
103 IL_LAST_CCK_RATE = IL_RATE_11M_INDEX, 103 IL_LAST_CCK_RATE = IL_RATE_11M_INDEX,
diff --git a/drivers/net/wireless/iwlegacy/iwl-prph.h b/drivers/net/wireless/iwlegacy/iwl-prph.h
index 96788a128a61..caa383726787 100644
--- a/drivers/net/wireless/iwlegacy/iwl-prph.h
+++ b/drivers/net/wireless/iwlegacy/iwl-prph.h
@@ -320,19 +320,19 @@
320 * can keep track of at one time when creating block-ack chains of frames. 320 * can keep track of at one time when creating block-ack chains of frames.
321 * Note that "64" matches the number of ack bits in a block-ack packet. 321 * Note that "64" matches the number of ack bits in a block-ack packet.
322 * Driver should use SCD_WIN_SIZE and SCD_FRAME_LIMIT values to initialize 322 * Driver should use SCD_WIN_SIZE and SCD_FRAME_LIMIT values to initialize
323 * IWL49_SCD_CONTEXT_QUEUE_OFFSET(x) values. 323 * IL49_SCD_CONTEXT_QUEUE_OFFSET(x) values.
324 */ 324 */
325#define SCD_WIN_SIZE 64 325#define SCD_WIN_SIZE 64
326#define SCD_FRAME_LIMIT 64 326#define SCD_FRAME_LIMIT 64
327 327
328/* SCD registers are internal, must be accessed via HBUS_TARG_PRPH regs */ 328/* SCD registers are internal, must be accessed via HBUS_TARG_PRPH regs */
329#define IWL49_SCD_START_OFFSET 0xa02c00 329#define IL49_SCD_START_OFFSET 0xa02c00
330 330
331/* 331/*
332 * 4965 tells driver SRAM address for internal scheduler structs via this reg. 332 * 4965 tells driver SRAM address for internal scheduler structs via this reg.
333 * Value is valid only after "Alive" response from uCode. 333 * Value is valid only after "Alive" response from uCode.
334 */ 334 */
335#define IWL49_SCD_SRAM_BASE_ADDR (IWL49_SCD_START_OFFSET + 0x0) 335#define IL49_SCD_SRAM_BASE_ADDR (IL49_SCD_START_OFFSET + 0x0)
336 336
337/* 337/*
338 * Driver may need to update queue-empty bits after changing queue's 338 * Driver may need to update queue-empty bits after changing queue's
@@ -343,7 +343,7 @@
343 * 15-00: Empty state, one for each queue -- 1: empty, 0: non-empty 343 * 15-00: Empty state, one for each queue -- 1: empty, 0: non-empty
344 * NOTE: This register is not used by Linux driver. 344 * NOTE: This register is not used by Linux driver.
345 */ 345 */
346#define IWL49_SCD_EMPTY_BITS (IWL49_SCD_START_OFFSET + 0x4) 346#define IL49_SCD_EMPTY_BITS (IL49_SCD_START_OFFSET + 0x4)
347 347
348/* 348/*
349 * Physical base address of array of byte count (BC) circular buffers (CBs). 349 * Physical base address of array of byte count (BC) circular buffers (CBs).
@@ -355,7 +355,7 @@
355 * Bit fields: 355 * Bit fields:
356 * 25-00: Byte Count CB physical address [35:10], must be 1024-byte aligned. 356 * 25-00: Byte Count CB physical address [35:10], must be 1024-byte aligned.
357 */ 357 */
358#define IWL49_SCD_DRAM_BASE_ADDR (IWL49_SCD_START_OFFSET + 0x10) 358#define IL49_SCD_DRAM_BASE_ADDR (IL49_SCD_START_OFFSET + 0x10)
359 359
360/* 360/*
361 * Enables any/all Tx DMA/FIFO channels. 361 * Enables any/all Tx DMA/FIFO channels.
@@ -364,7 +364,7 @@
364 * Bit fields: 364 * Bit fields:
365 * 7- 0: Enable (1), disable (0), one bit for each channel 0-7 365 * 7- 0: Enable (1), disable (0), one bit for each channel 0-7
366 */ 366 */
367#define IWL49_SCD_TXFACT (IWL49_SCD_START_OFFSET + 0x1c) 367#define IL49_SCD_TXFACT (IL49_SCD_START_OFFSET + 0x1c)
368/* 368/*
369 * Queue (x) Write Pointers (indexes, really!), one for each Tx queue. 369 * Queue (x) Write Pointers (indexes, really!), one for each Tx queue.
370 * Initialized and updated by driver as new TFDs are added to queue. 370 * Initialized and updated by driver as new TFDs are added to queue.
@@ -372,7 +372,7 @@
372 * Start Sequence Number; index = (SSN & 0xff) 372 * Start Sequence Number; index = (SSN & 0xff)
373 * NOTE: Alternative to HBUS_TARG_WRPTR, which is what Linux driver uses? 373 * NOTE: Alternative to HBUS_TARG_WRPTR, which is what Linux driver uses?
374 */ 374 */
375#define IWL49_SCD_QUEUE_WRPTR(x) (IWL49_SCD_START_OFFSET + 0x24 + (x) * 4) 375#define IL49_SCD_QUEUE_WRPTR(x) (IL49_SCD_START_OFFSET + 0x24 + (x) * 4)
376 376
377/* 377/*
378 * Queue (x) Read Pointers (indexes, really!), one for each Tx queue. 378 * Queue (x) Read Pointers (indexes, really!), one for each Tx queue.
@@ -380,7 +380,7 @@
380 * For Scheduler-ACK mode, index indicates first frame in Tx window. 380 * For Scheduler-ACK mode, index indicates first frame in Tx window.
381 * Initialized by driver, updated by scheduler. 381 * Initialized by driver, updated by scheduler.
382 */ 382 */
383#define IWL49_SCD_QUEUE_RDPTR(x) (IWL49_SCD_START_OFFSET + 0x64 + (x) * 4) 383#define IL49_SCD_QUEUE_RDPTR(x) (IL49_SCD_START_OFFSET + 0x64 + (x) * 4)
384 384
385/* 385/*
386 * Select which queues work in chain mode (1) vs. not (0). 386 * Select which queues work in chain mode (1) vs. not (0).
@@ -391,7 +391,7 @@
391 * NOTE: If driver sets up queue for chain mode, it should be also set up 391 * NOTE: If driver sets up queue for chain mode, it should be also set up
392 * Scheduler-ACK mode as well, via SCD_QUEUE_STATUS_BITS(x). 392 * Scheduler-ACK mode as well, via SCD_QUEUE_STATUS_BITS(x).
393 */ 393 */
394#define IWL49_SCD_QUEUECHAIN_SEL (IWL49_SCD_START_OFFSET + 0xd0) 394#define IL49_SCD_QUEUECHAIN_SEL (IL49_SCD_START_OFFSET + 0xd0)
395 395
396/* 396/*
397 * Select which queues interrupt driver when scheduler increments 397 * Select which queues interrupt driver when scheduler increments
@@ -402,7 +402,7 @@
402 * NOTE: This functionality is apparently a no-op; driver relies on interrupts 402 * NOTE: This functionality is apparently a no-op; driver relies on interrupts
403 * from Rx queue to read Tx command responses and update Tx queues. 403 * from Rx queue to read Tx command responses and update Tx queues.
404 */ 404 */
405#define IWL49_SCD_INTERRUPT_MASK (IWL49_SCD_START_OFFSET + 0xe4) 405#define IL49_SCD_INTERRUPT_MASK (IL49_SCD_START_OFFSET + 0xe4)
406 406
407/* 407/*
408 * Queue search status registers. One for each queue. 408 * Queue search status registers. One for each queue.
@@ -423,18 +423,18 @@
423 * NOTE: If enabling Scheduler-ACK mode, chain mode should also be enabled 423 * NOTE: If enabling Scheduler-ACK mode, chain mode should also be enabled
424 * via SCD_QUEUECHAIN_SEL. 424 * via SCD_QUEUECHAIN_SEL.
425 */ 425 */
426#define IWL49_SCD_QUEUE_STATUS_BITS(x)\ 426#define IL49_SCD_QUEUE_STATUS_BITS(x)\
427 (IWL49_SCD_START_OFFSET + 0x104 + (x) * 4) 427 (IL49_SCD_START_OFFSET + 0x104 + (x) * 4)
428 428
429/* Bit field positions */ 429/* Bit field positions */
430#define IWL49_SCD_QUEUE_STTS_REG_POS_ACTIVE (0) 430#define IL49_SCD_QUEUE_STTS_REG_POS_ACTIVE (0)
431#define IWL49_SCD_QUEUE_STTS_REG_POS_TXF (1) 431#define IL49_SCD_QUEUE_STTS_REG_POS_TXF (1)
432#define IWL49_SCD_QUEUE_STTS_REG_POS_WSL (5) 432#define IL49_SCD_QUEUE_STTS_REG_POS_WSL (5)
433#define IWL49_SCD_QUEUE_STTS_REG_POS_SCD_ACK (8) 433#define IL49_SCD_QUEUE_STTS_REG_POS_SCD_ACK (8)
434 434
435/* Write masks */ 435/* Write masks */
436#define IWL49_SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN (10) 436#define IL49_SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN (10)
437#define IWL49_SCD_QUEUE_STTS_REG_MSK (0x0007FC00) 437#define IL49_SCD_QUEUE_STTS_REG_MSK (0x0007FC00)
438 438
439/** 439/**
440 * 4965 internal SRAM structures for scheduler, shared with driver ... 440 * 4965 internal SRAM structures for scheduler, shared with driver ...
@@ -470,14 +470,14 @@
470 * Init must be done after driver receives "Alive" response from 4965 uCode, 470 * Init must be done after driver receives "Alive" response from 4965 uCode,
471 * and when setting up queue for aggregation. 471 * and when setting up queue for aggregation.
472 */ 472 */
473#define IWL49_SCD_CONTEXT_DATA_OFFSET 0x380 473#define IL49_SCD_CONTEXT_DATA_OFFSET 0x380
474#define IWL49_SCD_CONTEXT_QUEUE_OFFSET(x) \ 474#define IL49_SCD_CONTEXT_QUEUE_OFFSET(x) \
475 (IWL49_SCD_CONTEXT_DATA_OFFSET + ((x) * 8)) 475 (IL49_SCD_CONTEXT_DATA_OFFSET + ((x) * 8))
476 476
477#define IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS (0) 477#define IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS (0)
478#define IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK (0x0000007F) 478#define IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK (0x0000007F)
479#define IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS (16) 479#define IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS (16)
480#define IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK (0x007F0000) 480#define IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK (0x007F0000)
481 481
482/* 482/*
483 * Tx Status Bitmap 483 * Tx Status Bitmap
@@ -486,7 +486,7 @@
486 * "Alive" notification from uCode. Area is used only by device itself; 486 * "Alive" notification from uCode. Area is used only by device itself;
487 * no other support (besides clearing) is required from driver. 487 * no other support (besides clearing) is required from driver.
488 */ 488 */
489#define IWL49_SCD_TX_STTS_BITMAP_OFFSET 0x400 489#define IL49_SCD_TX_STTS_BITMAP_OFFSET 0x400
490 490
491/* 491/*
492 * RAxTID to queue translation mapping. 492 * RAxTID to queue translation mapping.
@@ -508,11 +508,11 @@
508 * must read a dword-aligned value from device SRAM, replace the 16-bit map 508 * must read a dword-aligned value from device SRAM, replace the 16-bit map
509 * value of interest, and write the dword value back into device SRAM. 509 * value of interest, and write the dword value back into device SRAM.
510 */ 510 */
511#define IWL49_SCD_TRANSLATE_TBL_OFFSET 0x500 511#define IL49_SCD_TRANSLATE_TBL_OFFSET 0x500
512 512
513/* Find translation table dword to read/write for given queue */ 513/* Find translation table dword to read/write for given queue */
514#define IWL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(x) \ 514#define IL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(x) \
515 ((IWL49_SCD_TRANSLATE_TBL_OFFSET + ((x) * 2)) & 0xfffffffc) 515 ((IL49_SCD_TRANSLATE_TBL_OFFSET + ((x) * 2)) & 0xfffffffc)
516 516
517#define IL_SCD_TXFIFO_POS_TID (0) 517#define IL_SCD_TXFIFO_POS_TID (0)
518#define IL_SCD_TXFIFO_POS_RA (4) 518#define IL_SCD_TXFIFO_POS_RA (4)
diff --git a/drivers/net/wireless/iwlegacy/iwl-scan.c b/drivers/net/wireless/iwlegacy/iwl-scan.c
index e352a185a96e..e4e5fbb2c644 100644
--- a/drivers/net/wireless/iwlegacy/iwl-scan.c
+++ b/drivers/net/wireless/iwlegacy/iwl-scan.c
@@ -185,7 +185,7 @@ EXPORT_SYMBOL(il_scan_cancel_timeout);
185static void il_rx_reply_scan(struct il_priv *il, 185static void il_rx_reply_scan(struct il_priv *il,
186 struct il_rx_mem_buffer *rxb) 186 struct il_rx_mem_buffer *rxb)
187{ 187{
188#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 188#ifdef CONFIG_IWLEGACY_DEBUG
189 struct il_rx_packet *pkt = rxb_addr(rxb); 189 struct il_rx_packet *pkt = rxb_addr(rxb);
190 struct il_scanreq_notification *notif = 190 struct il_scanreq_notification *notif =
191 (struct il_scanreq_notification *)pkt->u.raw; 191 (struct il_scanreq_notification *)pkt->u.raw;
@@ -216,7 +216,7 @@ static void il_rx_scan_start_notif(struct il_priv *il,
216static void il_rx_scan_results_notif(struct il_priv *il, 216static void il_rx_scan_results_notif(struct il_priv *il,
217 struct il_rx_mem_buffer *rxb) 217 struct il_rx_mem_buffer *rxb)
218{ 218{
219#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 219#ifdef CONFIG_IWLEGACY_DEBUG
220 struct il_rx_packet *pkt = rxb_addr(rxb); 220 struct il_rx_packet *pkt = rxb_addr(rxb);
221 struct il_scanresults_notification *notif = 221 struct il_scanresults_notification *notif =
222 (struct il_scanresults_notification *)pkt->u.raw; 222 (struct il_scanresults_notification *)pkt->u.raw;
@@ -239,7 +239,7 @@ static void il_rx_scan_complete_notif(struct il_priv *il,
239 struct il_rx_mem_buffer *rxb) 239 struct il_rx_mem_buffer *rxb)
240{ 240{
241 241
242#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 242#ifdef CONFIG_IWLEGACY_DEBUG
243 struct il_rx_packet *pkt = rxb_addr(rxb); 243 struct il_rx_packet *pkt = rxb_addr(rxb);
244 struct il_scancomplete_notification *scan_notif = (void *)pkt->u.raw; 244 struct il_scancomplete_notification *scan_notif = (void *)pkt->u.raw;
245#endif 245#endif
diff --git a/drivers/net/wireless/iwlegacy/iwl-sta.c b/drivers/net/wireless/iwlegacy/iwl-sta.c
index cca467c26c0d..68c43b08b2c1 100644
--- a/drivers/net/wireless/iwlegacy/iwl-sta.c
+++ b/drivers/net/wireless/iwlegacy/iwl-sta.c
@@ -681,7 +681,7 @@ void il_dealloc_bcast_stations(struct il_priv *il)
681} 681}
682EXPORT_SYMBOL_GPL(il_dealloc_bcast_stations); 682EXPORT_SYMBOL_GPL(il_dealloc_bcast_stations);
683 683
684#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 684#ifdef CONFIG_IWLEGACY_DEBUG
685static void il_dump_lq_cmd(struct il_priv *il, 685static void il_dump_lq_cmd(struct il_priv *il,
686 struct il_link_quality_cmd *lq) 686 struct il_link_quality_cmd *lq)
687{ 687{
diff --git a/drivers/net/wireless/iwlegacy/iwl-tx.c b/drivers/net/wireless/iwlegacy/iwl-tx.c
index 0d3515d21bfc..531205942f44 100644
--- a/drivers/net/wireless/iwlegacy/iwl-tx.c
+++ b/drivers/net/wireless/iwlegacy/iwl-tx.c
@@ -507,7 +507,7 @@ int il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd)
507 if (idx == TFD_CMD_SLOTS) 507 if (idx == TFD_CMD_SLOTS)
508 len = IL_MAX_CMD_SIZE; 508 len = IL_MAX_CMD_SIZE;
509 509
510#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 510#ifdef CONFIG_IWLEGACY_DEBUG
511 switch (out_cmd->hdr.cmd) { 511 switch (out_cmd->hdr.cmd) {
512 case REPLY_TX_LINK_QUALITY_CMD: 512 case REPLY_TX_LINK_QUALITY_CMD:
513 case SENSITIVITY_CMD: 513 case SENSITIVITY_CMD:
diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c
index ec9a93c9cb8f..2d1f22a53365 100644
--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
@@ -68,7 +68,7 @@
68#define DRV_DESCRIPTION \ 68#define DRV_DESCRIPTION \
69"Intel(R) PRO/Wireless 3945ABG/BG Network Connection driver for Linux" 69"Intel(R) PRO/Wireless 3945ABG/BG Network Connection driver for Linux"
70 70
71#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 71#ifdef CONFIG_IWLEGACY_DEBUG
72#define VD "d" 72#define VD "d"
73#else 73#else
74#define VD 74#define VD
@@ -500,7 +500,7 @@ static int il3945_tx_skb(struct il_priv *il, struct sk_buff *skb)
500 500
501 fc = hdr->frame_control; 501 fc = hdr->frame_control;
502 502
503#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 503#ifdef CONFIG_IWLEGACY_DEBUG
504 if (ieee80211_is_auth(fc)) 504 if (ieee80211_is_auth(fc))
505 D_TX("Sending AUTH frame\n"); 505 D_TX("Sending AUTH frame\n");
506 else if (ieee80211_is_assoc_req(fc)) 506 else if (ieee80211_is_assoc_req(fc))
@@ -783,7 +783,7 @@ static void il3945_rx_reply_alive(struct il_priv *il,
783static void il3945_rx_reply_add_sta(struct il_priv *il, 783static void il3945_rx_reply_add_sta(struct il_priv *il,
784 struct il_rx_mem_buffer *rxb) 784 struct il_rx_mem_buffer *rxb)
785{ 785{
786#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 786#ifdef CONFIG_IWLEGACY_DEBUG
787 struct il_rx_packet *pkt = rxb_addr(rxb); 787 struct il_rx_packet *pkt = rxb_addr(rxb);
788#endif 788#endif
789 789
@@ -795,7 +795,7 @@ static void il3945_rx_beacon_notif(struct il_priv *il,
795{ 795{
796 struct il_rx_packet *pkt = rxb_addr(rxb); 796 struct il_rx_packet *pkt = rxb_addr(rxb);
797 struct il3945_beacon_notif *beacon = &(pkt->u.beacon_status); 797 struct il3945_beacon_notif *beacon = &(pkt->u.beacon_status);
798#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 798#ifdef CONFIG_IWLEGACY_DEBUG
799 u8 rate = beacon->beacon_notify_hdr.rate; 799 u8 rate = beacon->beacon_notify_hdr.rate;
800 800
801 D_RX("beacon status %x retries %d iss %d " 801 D_RX("beacon status %x retries %d iss %d "
@@ -1410,7 +1410,7 @@ static void il3945_irq_tasklet(struct il_priv *il)
1410 u32 inta, handled = 0; 1410 u32 inta, handled = 0;
1411 u32 inta_fh; 1411 u32 inta_fh;
1412 unsigned long flags; 1412 unsigned long flags;
1413#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 1413#ifdef CONFIG_IWLEGACY_DEBUG
1414 u32 inta_mask; 1414 u32 inta_mask;
1415#endif 1415#endif
1416 1416
@@ -1428,7 +1428,7 @@ static void il3945_irq_tasklet(struct il_priv *il)
1428 inta_fh = _il_rd(il, CSR_FH_INT_STATUS); 1428 inta_fh = _il_rd(il, CSR_FH_INT_STATUS);
1429 _il_wr(il, CSR_FH_INT_STATUS, inta_fh); 1429 _il_wr(il, CSR_FH_INT_STATUS, inta_fh);
1430 1430
1431#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 1431#ifdef CONFIG_IWLEGACY_DEBUG
1432 if (il_get_debug_level(il) & IL_DL_ISR) { 1432 if (il_get_debug_level(il) & IL_DL_ISR) {
1433 /* just for debug */ 1433 /* just for debug */
1434 inta_mask = _il_rd(il, CSR_INT_MASK); 1434 inta_mask = _il_rd(il, CSR_INT_MASK);
@@ -1463,7 +1463,7 @@ static void il3945_irq_tasklet(struct il_priv *il)
1463 return; 1463 return;
1464 } 1464 }
1465 1465
1466#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 1466#ifdef CONFIG_IWLEGACY_DEBUG
1467 if (il_get_debug_level(il) & (IL_DL_ISR)) { 1467 if (il_get_debug_level(il) & (IL_DL_ISR)) {
1468 /* NIC fires this, but we don't use it, redundant with WAKEUP */ 1468 /* NIC fires this, but we don't use it, redundant with WAKEUP */
1469 if (inta & CSR_INT_BIT_SCD) { 1469 if (inta & CSR_INT_BIT_SCD) {
@@ -1541,7 +1541,7 @@ static void il3945_irq_tasklet(struct il_priv *il)
1541 if (test_bit(STATUS_INT_ENABLED, &il->status)) 1541 if (test_bit(STATUS_INT_ENABLED, &il->status))
1542 il_enable_interrupts(il); 1542 il_enable_interrupts(il);
1543 1543
1544#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 1544#ifdef CONFIG_IWLEGACY_DEBUG
1545 if (il_get_debug_level(il) & (IL_DL_ISR)) { 1545 if (il_get_debug_level(il) & (IL_DL_ISR)) {
1546 inta = _il_rd(il, CSR_INT); 1546 inta = _il_rd(il, CSR_INT);
1547 inta_mask = _il_rd(il, CSR_INT_MASK); 1547 inta_mask = _il_rd(il, CSR_INT_MASK);
@@ -1612,12 +1612,12 @@ static int il3945_get_channels_for_scan(struct il_priv *il,
1612 * hearing clear Rx packet).*/ 1612 * hearing clear Rx packet).*/
1613 if (IL_UCODE_API(il->ucode_ver) >= 2) { 1613 if (IL_UCODE_API(il->ucode_ver) >= 2) {
1614 if (n_probes) 1614 if (n_probes)
1615 scan_ch->type |= IWL39_SCAN_PROBE_MASK(n_probes); 1615 scan_ch->type |= IL39_SCAN_PROBE_MASK(n_probes);
1616 } else { 1616 } else {
1617 /* uCode v1 does not allow setting direct probe bits on 1617 /* uCode v1 does not allow setting direct probe bits on
1618 * passive channel. */ 1618 * passive channel. */
1619 if ((scan_ch->type & 1) && n_probes) 1619 if ((scan_ch->type & 1) && n_probes)
1620 scan_ch->type |= IWL39_SCAN_PROBE_MASK(n_probes); 1620 scan_ch->type |= IL39_SCAN_PROBE_MASK(n_probes);
1621 } 1621 }
1622 1622
1623 /* Set txpower levels to defaults */ 1623 /* Set txpower levels to defaults */
@@ -1659,7 +1659,7 @@ static void il3945_init_hw_rates(struct il_priv *il,
1659 rates[i].hw_value = i; /* Rate scaling will work on indexes */ 1659 rates[i].hw_value = i; /* Rate scaling will work on indexes */
1660 rates[i].hw_value_short = i; 1660 rates[i].hw_value_short = i;
1661 rates[i].flags = 0; 1661 rates[i].flags = 0;
1662 if (i > IWL39_LAST_OFDM_RATE || i < IL_FIRST_OFDM_RATE) { 1662 if (i > IL39_LAST_OFDM_RATE || i < IL_FIRST_OFDM_RATE) {
1663 /* 1663 /*
1664 * If CCK != 1M then set short preamble rate flag. 1664 * If CCK != 1M then set short preamble rate flag.
1665 */ 1665 */
@@ -1699,7 +1699,7 @@ static int il3945_verify_inst_full(struct il_priv *il, __le32 *image, u32 len)
1699 D_INFO("ucode inst image size is %u\n", len); 1699 D_INFO("ucode inst image size is %u\n", len);
1700 1700
1701 il_wr(il, HBUS_TARG_MEM_RADDR, 1701 il_wr(il, HBUS_TARG_MEM_RADDR,
1702 IWL39_RTC_INST_LOWER_BOUND); 1702 IL39_RTC_INST_LOWER_BOUND);
1703 1703
1704 errcnt = 0; 1704 errcnt = 0;
1705 for (; len > 0; len -= sizeof(u32), image++) { 1705 for (; len > 0; len -= sizeof(u32), image++) {
@@ -1746,7 +1746,7 @@ static int il3945_verify_inst_sparse(struct il_priv *il, __le32 *image, u32 len)
1746 /* NOTE: Use the debugless read so we don't flood kernel log 1746 /* NOTE: Use the debugless read so we don't flood kernel log
1747 * if IL_DL_IO is set */ 1747 * if IL_DL_IO is set */
1748 il_wr(il, HBUS_TARG_MEM_RADDR, 1748 il_wr(il, HBUS_TARG_MEM_RADDR,
1749 i + IWL39_RTC_INST_LOWER_BOUND); 1749 i + IL39_RTC_INST_LOWER_BOUND);
1750 val = _il_rd(il, HBUS_TARG_MEM_RDAT); 1750 val = _il_rd(il, HBUS_TARG_MEM_RDAT);
1751 if (val != le32_to_cpu(*image)) { 1751 if (val != le32_to_cpu(*image)) {
1752#if 0 /* Enable this if you want to see details */ 1752#if 0 /* Enable this if you want to see details */
@@ -1820,7 +1820,7 @@ static void il3945_nic_start(struct il_priv *il)
1820 _il_wr(il, CSR_RESET, 0); 1820 _il_wr(il, CSR_RESET, 0);
1821} 1821}
1822 1822
1823#define IWL3945_UCODE_GET(item) \ 1823#define IL3945_UCODE_GET(item) \
1824static u32 il3945_ucode_get_##item(const struct il_ucode_header *ucode)\ 1824static u32 il3945_ucode_get_##item(const struct il_ucode_header *ucode)\
1825{ \ 1825{ \
1826 return le32_to_cpu(ucode->v1.item); \ 1826 return le32_to_cpu(ucode->v1.item); \
@@ -1836,11 +1836,11 @@ static u8 *il3945_ucode_get_data(const struct il_ucode_header *ucode)
1836 return (u8 *) ucode->v1.data; 1836 return (u8 *) ucode->v1.data;
1837} 1837}
1838 1838
1839IWL3945_UCODE_GET(inst_size); 1839IL3945_UCODE_GET(inst_size);
1840IWL3945_UCODE_GET(data_size); 1840IL3945_UCODE_GET(data_size);
1841IWL3945_UCODE_GET(init_size); 1841IL3945_UCODE_GET(init_size);
1842IWL3945_UCODE_GET(init_data_size); 1842IL3945_UCODE_GET(init_data_size);
1843IWL3945_UCODE_GET(boot_size); 1843IL3945_UCODE_GET(boot_size);
1844 1844
1845/** 1845/**
1846 * il3945_read_ucode - Read uCode images from disk file. 1846 * il3945_read_ucode - Read uCode images from disk file.
@@ -1967,34 +1967,34 @@ static int il3945_read_ucode(struct il_priv *il)
1967 } 1967 }
1968 1968
1969 /* Verify that uCode images will fit in card's SRAM */ 1969 /* Verify that uCode images will fit in card's SRAM */
1970 if (inst_size > IWL39_MAX_INST_SIZE) { 1970 if (inst_size > IL39_MAX_INST_SIZE) {
1971 D_INFO("uCode instr len %d too large to fit in\n", 1971 D_INFO("uCode instr len %d too large to fit in\n",
1972 inst_size); 1972 inst_size);
1973 ret = -EINVAL; 1973 ret = -EINVAL;
1974 goto err_release; 1974 goto err_release;
1975 } 1975 }
1976 1976
1977 if (data_size > IWL39_MAX_DATA_SIZE) { 1977 if (data_size > IL39_MAX_DATA_SIZE) {
1978 D_INFO("uCode data len %d too large to fit in\n", 1978 D_INFO("uCode data len %d too large to fit in\n",
1979 data_size); 1979 data_size);
1980 ret = -EINVAL; 1980 ret = -EINVAL;
1981 goto err_release; 1981 goto err_release;
1982 } 1982 }
1983 if (init_size > IWL39_MAX_INST_SIZE) { 1983 if (init_size > IL39_MAX_INST_SIZE) {
1984 D_INFO( 1984 D_INFO(
1985 "uCode init instr len %d too large to fit in\n", 1985 "uCode init instr len %d too large to fit in\n",
1986 init_size); 1986 init_size);
1987 ret = -EINVAL; 1987 ret = -EINVAL;
1988 goto err_release; 1988 goto err_release;
1989 } 1989 }
1990 if (init_data_size > IWL39_MAX_DATA_SIZE) { 1990 if (init_data_size > IL39_MAX_DATA_SIZE) {
1991 D_INFO( 1991 D_INFO(
1992 "uCode init data len %d too large to fit in\n", 1992 "uCode init data len %d too large to fit in\n",
1993 init_data_size); 1993 init_data_size);
1994 ret = -EINVAL; 1994 ret = -EINVAL;
1995 goto err_release; 1995 goto err_release;
1996 } 1996 }
1997 if (boot_size > IWL39_MAX_BSM_SIZE) { 1997 if (boot_size > IL39_MAX_BSM_SIZE) {
1998 D_INFO( 1998 D_INFO(
1999 "uCode boot instr len %d too large to fit in\n", 1999 "uCode boot instr len %d too large to fit in\n",
2000 boot_size); 2000 boot_size);
@@ -3118,7 +3118,7 @@ static void il3945_configure_filter(struct ieee80211_hw *hw,
3118 * 3118 *
3119 *****************************************************************************/ 3119 *****************************************************************************/
3120 3120
3121#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 3121#ifdef CONFIG_IWLEGACY_DEBUG
3122 3122
3123/* 3123/*
3124 * The following adds a new attribute to the sysfs representation 3124 * The following adds a new attribute to the sysfs representation
@@ -3160,7 +3160,7 @@ static ssize_t il3945_store_debug_level(struct device *d,
3160static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO, 3160static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO,
3161 il3945_show_debug_level, il3945_store_debug_level); 3161 il3945_show_debug_level, il3945_store_debug_level);
3162 3162
3163#endif /* CONFIG_IWLWIFI_LEGACY_DEBUG */ 3163#endif /* CONFIG_IWLEGACY_DEBUG */
3164 3164
3165static ssize_t il3945_show_temperature(struct device *d, 3165static ssize_t il3945_show_temperature(struct device *d,
3166 struct device_attribute *attr, char *buf) 3166 struct device_attribute *attr, char *buf)
@@ -3495,7 +3495,7 @@ static struct attribute *il3945_sysfs_entries[] = {
3495 &dev_attr_status.attr, 3495 &dev_attr_status.attr,
3496 &dev_attr_temperature.attr, 3496 &dev_attr_temperature.attr,
3497 &dev_attr_tx_power.attr, 3497 &dev_attr_tx_power.attr,
3498#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 3498#ifdef CONFIG_IWLEGACY_DEBUG
3499 &dev_attr_debug_level.attr, 3499 &dev_attr_debug_level.attr,
3500#endif 3500#endif
3501 NULL 3501 NULL
@@ -3583,7 +3583,7 @@ err:
3583 return ret; 3583 return ret;
3584} 3584}
3585 3585
3586#define IWL3945_MAX_PROBE_REQUEST 200 3586#define IL3945_MAX_PROBE_REQUEST 200
3587 3587
3588static int il3945_setup_mac(struct il_priv *il) 3588static int il3945_setup_mac(struct il_priv *il)
3589{ 3589{
@@ -3607,7 +3607,7 @@ static int il3945_setup_mac(struct il_priv *il)
3607 3607
3608 hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX_3945; 3608 hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX_3945;
3609 /* we create the 802.11 header and a zero-length SSID element */ 3609 /* we create the 802.11 header and a zero-length SSID element */
3610 hw->wiphy->max_scan_ie_len = IWL3945_MAX_PROBE_REQUEST - 24 - 2; 3610 hw->wiphy->max_scan_ie_len = IL3945_MAX_PROBE_REQUEST - 24 - 2;
3611 3611
3612 /* Default value; 4 EDCA QOS priorities */ 3612 /* Default value; 4 EDCA QOS priorities */
3613 hw->queues = 4; 3613 hw->queues = 4;
@@ -3656,7 +3656,7 @@ static int il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *en
3656 il = hw->priv; 3656 il = hw->priv;
3657 SET_IEEE80211_DEV(hw, &pdev->dev); 3657 SET_IEEE80211_DEV(hw, &pdev->dev);
3658 3658
3659 il->cmd_queue = IWL39_CMD_QUEUE_NUM; 3659 il->cmd_queue = IL39_CMD_QUEUE_NUM;
3660 3660
3661 /* 3945 has only one valid context */ 3661 /* 3945 has only one valid context */
3662 il->valid_contexts = BIT(IL_RXON_CTX_BSS); 3662 il->valid_contexts = BIT(IL_RXON_CTX_BSS);
@@ -3992,7 +3992,7 @@ static void __exit il3945_exit(void)
3992 il3945_rate_control_unregister(); 3992 il3945_rate_control_unregister();
3993} 3993}
3994 3994
3995MODULE_FIRMWARE(IWL3945_MODULE_FIRMWARE(IWL3945_UCODE_API_MAX)); 3995MODULE_FIRMWARE(IL3945_MODULE_FIRMWARE(IL3945_UCODE_API_MAX));
3996 3996
3997module_param_named(antenna, il3945_mod_params.antenna, int, S_IRUGO); 3997module_param_named(antenna, il3945_mod_params.antenna, int, S_IRUGO);
3998MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])"); 3998MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])");
@@ -4002,7 +4002,7 @@ MODULE_PARM_DESC(swcrypto,
4002module_param_named(disable_hw_scan, il3945_mod_params.disable_hw_scan, 4002module_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_IWLEGACY_DEBUG
4006module_param_named(debug, il_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
diff --git a/drivers/net/wireless/iwlegacy/iwl4965-base.c b/drivers/net/wireless/iwlegacy/iwl4965-base.c
index 0f7d44c95f08..ddf4200a95cf 100644
--- a/drivers/net/wireless/iwlegacy/iwl4965-base.c
+++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c
@@ -72,7 +72,7 @@
72 */ 72 */
73#define DRV_DESCRIPTION "Intel(R) Wireless WiFi 4965 driver for Linux" 73#define DRV_DESCRIPTION "Intel(R) Wireless WiFi 4965 driver for Linux"
74 74
75#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 75#ifdef CONFIG_IWLEGACY_DEBUG
76#define VD "d" 76#define VD "d"
77#else 77#else
78#define VD 78#define VD
@@ -493,7 +493,7 @@ static void il4965_rx_beacon_notif(struct il_priv *il,
493 struct il_rx_packet *pkt = rxb_addr(rxb); 493 struct il_rx_packet *pkt = rxb_addr(rxb);
494 struct il4965_beacon_notif *beacon = 494 struct il4965_beacon_notif *beacon =
495 (struct il4965_beacon_notif *)pkt->u.raw; 495 (struct il4965_beacon_notif *)pkt->u.raw;
496#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 496#ifdef CONFIG_IWLEGACY_DEBUG
497 u8 rate = il4965_hw_get_rate(beacon->beacon_notify_hdr.rate_n_flags); 497 u8 rate = il4965_hw_get_rate(beacon->beacon_notify_hdr.rate_n_flags);
498 498
499 D_RX("beacon status %x retries %d iss %d " 499 D_RX("beacon status %x retries %d iss %d "
@@ -778,7 +778,7 @@ static void il4965_irq_tasklet(struct il_priv *il)
778 u32 inta_fh; 778 u32 inta_fh;
779 unsigned long flags; 779 unsigned long flags;
780 u32 i; 780 u32 i;
781#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 781#ifdef CONFIG_IWLEGACY_DEBUG
782 u32 inta_mask; 782 u32 inta_mask;
783#endif 783#endif
784 784
@@ -796,7 +796,7 @@ static void il4965_irq_tasklet(struct il_priv *il)
796 inta_fh = _il_rd(il, CSR_FH_INT_STATUS); 796 inta_fh = _il_rd(il, CSR_FH_INT_STATUS);
797 _il_wr(il, CSR_FH_INT_STATUS, inta_fh); 797 _il_wr(il, CSR_FH_INT_STATUS, inta_fh);
798 798
799#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 799#ifdef CONFIG_IWLEGACY_DEBUG
800 if (il_get_debug_level(il) & IL_DL_ISR) { 800 if (il_get_debug_level(il) & IL_DL_ISR) {
801 /* just for debug */ 801 /* just for debug */
802 inta_mask = _il_rd(il, CSR_INT_MASK); 802 inta_mask = _il_rd(il, CSR_INT_MASK);
@@ -831,7 +831,7 @@ static void il4965_irq_tasklet(struct il_priv *il)
831 return; 831 return;
832 } 832 }
833 833
834#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 834#ifdef CONFIG_IWLEGACY_DEBUG
835 if (il_get_debug_level(il) & (IL_DL_ISR)) { 835 if (il_get_debug_level(il) & (IL_DL_ISR)) {
836 /* NIC fires this, but we don't use it, redundant with WAKEUP */ 836 /* NIC fires this, but we don't use it, redundant with WAKEUP */
837 if (inta & CSR_INT_BIT_SCD) { 837 if (inta & CSR_INT_BIT_SCD) {
@@ -946,7 +946,7 @@ static void il4965_irq_tasklet(struct il_priv *il)
946 else if (handled & CSR_INT_BIT_RF_KILL) 946 else if (handled & CSR_INT_BIT_RF_KILL)
947 il_enable_rfkill_int(il); 947 il_enable_rfkill_int(il);
948 948
949#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 949#ifdef CONFIG_IWLEGACY_DEBUG
950 if (il_get_debug_level(il) & (IL_DL_ISR)) { 950 if (il_get_debug_level(il) & (IL_DL_ISR)) {
951 inta = _il_rd(il, CSR_INT); 951 inta = _il_rd(il, CSR_INT);
952 inta_mask = _il_rd(il, CSR_INT_MASK); 952 inta_mask = _il_rd(il, CSR_INT_MASK);
@@ -964,7 +964,7 @@ static void il4965_irq_tasklet(struct il_priv *il)
964 * 964 *
965 *****************************************************************************/ 965 *****************************************************************************/
966 966
967#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 967#ifdef CONFIG_IWLEGACY_DEBUG
968 968
969/* 969/*
970 * The following adds a new attribute to the sysfs representation 970 * The following adds a new attribute to the sysfs representation
@@ -1007,7 +1007,7 @@ static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO,
1007 il4965_show_debug_level, il4965_store_debug_level); 1007 il4965_show_debug_level, il4965_store_debug_level);
1008 1008
1009 1009
1010#endif /* CONFIG_IWLWIFI_LEGACY_DEBUG */ 1010#endif /* CONFIG_IWLEGACY_DEBUG */
1011 1011
1012 1012
1013static ssize_t il4965_show_temperature(struct device *d, 1013static ssize_t il4965_show_temperature(struct device *d,
@@ -1062,7 +1062,7 @@ static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO,
1062static struct attribute *il_sysfs_entries[] = { 1062static struct attribute *il_sysfs_entries[] = {
1063 &dev_attr_temperature.attr, 1063 &dev_attr_temperature.attr,
1064 &dev_attr_tx_power.attr, 1064 &dev_attr_tx_power.attr,
1065#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 1065#ifdef CONFIG_IWLEGACY_DEBUG
1066 &dev_attr_debug_level.attr, 1066 &dev_attr_debug_level.attr,
1067#endif 1067#endif
1068 NULL 1068 NULL
@@ -1607,7 +1607,7 @@ static const s8 default_queue_to_tx_fifo[] = {
1607 IL_TX_FIFO_VI, 1607 IL_TX_FIFO_VI,
1608 IL_TX_FIFO_BE, 1608 IL_TX_FIFO_BE,
1609 IL_TX_FIFO_BK, 1609 IL_TX_FIFO_BK,
1610 IWL49_CMD_FIFO_NUM, 1610 IL49_CMD_FIFO_NUM,
1611 IL_TX_FIFO_UNUSED, 1611 IL_TX_FIFO_UNUSED,
1612 IL_TX_FIFO_UNUSED, 1612 IL_TX_FIFO_UNUSED,
1613}; 1613};
@@ -1623,18 +1623,18 @@ static int il4965_alive_notify(struct il_priv *il)
1623 1623
1624 /* Clear 4965's internal Tx Scheduler data base */ 1624 /* Clear 4965's internal Tx Scheduler data base */
1625 il->scd_base_addr = il_rd_prph(il, 1625 il->scd_base_addr = il_rd_prph(il,
1626 IWL49_SCD_SRAM_BASE_ADDR); 1626 IL49_SCD_SRAM_BASE_ADDR);
1627 a = il->scd_base_addr + IWL49_SCD_CONTEXT_DATA_OFFSET; 1627 a = il->scd_base_addr + IL49_SCD_CONTEXT_DATA_OFFSET;
1628 for (; a < il->scd_base_addr + IWL49_SCD_TX_STTS_BITMAP_OFFSET; a += 4) 1628 for (; a < il->scd_base_addr + IL49_SCD_TX_STTS_BITMAP_OFFSET; a += 4)
1629 il_write_targ_mem(il, a, 0); 1629 il_write_targ_mem(il, a, 0);
1630 for (; a < il->scd_base_addr + IWL49_SCD_TRANSLATE_TBL_OFFSET; a += 4) 1630 for (; a < il->scd_base_addr + IL49_SCD_TRANSLATE_TBL_OFFSET; a += 4)
1631 il_write_targ_mem(il, a, 0); 1631 il_write_targ_mem(il, a, 0);
1632 for (; a < il->scd_base_addr + 1632 for (; a < il->scd_base_addr +
1633 IWL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(il->hw_params.max_txq_num); a += 4) 1633 IL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(il->hw_params.max_txq_num); a += 4)
1634 il_write_targ_mem(il, a, 0); 1634 il_write_targ_mem(il, a, 0);
1635 1635
1636 /* Tel 4965 where to find Tx byte count tables */ 1636 /* Tel 4965 where to find Tx byte count tables */
1637 il_wr_prph(il, IWL49_SCD_DRAM_BASE_ADDR, 1637 il_wr_prph(il, IL49_SCD_DRAM_BASE_ADDR,
1638 il->scd_bc_tbls.dma >> 10); 1638 il->scd_bc_tbls.dma >> 10);
1639 1639
1640 /* Enable DMA channel */ 1640 /* Enable DMA channel */
@@ -1650,32 +1650,32 @@ static int il4965_alive_notify(struct il_priv *il)
1650 reg_val | FH_TX_CHICKEN_BITS_SCD_AUTO_RETRY_EN); 1650 reg_val | FH_TX_CHICKEN_BITS_SCD_AUTO_RETRY_EN);
1651 1651
1652 /* Disable chain mode for all queues */ 1652 /* Disable chain mode for all queues */
1653 il_wr_prph(il, IWL49_SCD_QUEUECHAIN_SEL, 0); 1653 il_wr_prph(il, IL49_SCD_QUEUECHAIN_SEL, 0);
1654 1654
1655 /* Initialize each Tx queue (including the command queue) */ 1655 /* Initialize each Tx queue (including the command queue) */
1656 for (i = 0; i < il->hw_params.max_txq_num; i++) { 1656 for (i = 0; i < il->hw_params.max_txq_num; i++) {
1657 1657
1658 /* TFD circular buffer read/write indexes */ 1658 /* TFD circular buffer read/write indexes */
1659 il_wr_prph(il, IWL49_SCD_QUEUE_RDPTR(i), 0); 1659 il_wr_prph(il, IL49_SCD_QUEUE_RDPTR(i), 0);
1660 il_wr(il, HBUS_TARG_WRPTR, 0 | (i << 8)); 1660 il_wr(il, HBUS_TARG_WRPTR, 0 | (i << 8));
1661 1661
1662 /* Max Tx Window size for Scheduler-ACK mode */ 1662 /* Max Tx Window size for Scheduler-ACK mode */
1663 il_write_targ_mem(il, il->scd_base_addr + 1663 il_write_targ_mem(il, il->scd_base_addr +
1664 IWL49_SCD_CONTEXT_QUEUE_OFFSET(i), 1664 IL49_SCD_CONTEXT_QUEUE_OFFSET(i),
1665 (SCD_WIN_SIZE << 1665 (SCD_WIN_SIZE <<
1666 IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS) & 1666 IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS) &
1667 IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK); 1667 IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK);
1668 1668
1669 /* Frame limit */ 1669 /* Frame limit */
1670 il_write_targ_mem(il, il->scd_base_addr + 1670 il_write_targ_mem(il, il->scd_base_addr +
1671 IWL49_SCD_CONTEXT_QUEUE_OFFSET(i) + 1671 IL49_SCD_CONTEXT_QUEUE_OFFSET(i) +
1672 sizeof(u32), 1672 sizeof(u32),
1673 (SCD_FRAME_LIMIT << 1673 (SCD_FRAME_LIMIT <<
1674 IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) & 1674 IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) &
1675 IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK); 1675 IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK);
1676 1676
1677 } 1677 }
1678 il_wr_prph(il, IWL49_SCD_INTERRUPT_MASK, 1678 il_wr_prph(il, IL49_SCD_INTERRUPT_MASK,
1679 (1 << il->hw_params.max_txq_num) - 1); 1679 (1 << il->hw_params.max_txq_num) - 1);
1680 1680
1681 /* Activate all Tx DMA/FIFO channels */ 1681 /* Activate all Tx DMA/FIFO channels */
@@ -2733,7 +2733,7 @@ void il4965_set_wr_ptrs(struct il_priv *il, int txq_id, u32 index)
2733{ 2733{
2734 il_wr(il, HBUS_TARG_WRPTR, 2734 il_wr(il, HBUS_TARG_WRPTR,
2735 (index & 0xff) | (txq_id << 8)); 2735 (index & 0xff) | (txq_id << 8));
2736 il_wr_prph(il, IWL49_SCD_QUEUE_RDPTR(txq_id), index); 2736 il_wr_prph(il, IL49_SCD_QUEUE_RDPTR(txq_id), index);
2737} 2737}
2738 2738
2739void il4965_tx_queue_set_status(struct il_priv *il, 2739void il4965_tx_queue_set_status(struct il_priv *il,
@@ -2746,12 +2746,12 @@ void il4965_tx_queue_set_status(struct il_priv *il,
2746 int active = test_bit(txq_id, &il->txq_ctx_active_msk) ? 1 : 0; 2746 int active = test_bit(txq_id, &il->txq_ctx_active_msk) ? 1 : 0;
2747 2747
2748 /* Set up and activate */ 2748 /* Set up and activate */
2749 il_wr_prph(il, IWL49_SCD_QUEUE_STATUS_BITS(txq_id), 2749 il_wr_prph(il, IL49_SCD_QUEUE_STATUS_BITS(txq_id),
2750 (active << IWL49_SCD_QUEUE_STTS_REG_POS_ACTIVE) | 2750 (active << IL49_SCD_QUEUE_STTS_REG_POS_ACTIVE) |
2751 (tx_fifo_id << IWL49_SCD_QUEUE_STTS_REG_POS_TXF) | 2751 (tx_fifo_id << IL49_SCD_QUEUE_STTS_REG_POS_TXF) |
2752 (scd_retry << IWL49_SCD_QUEUE_STTS_REG_POS_WSL) | 2752 (scd_retry << IL49_SCD_QUEUE_STTS_REG_POS_WSL) |
2753 (scd_retry << IWL49_SCD_QUEUE_STTS_REG_POS_SCD_ACK) | 2753 (scd_retry << IL49_SCD_QUEUE_STTS_REG_POS_SCD_ACK) |
2754 IWL49_SCD_QUEUE_STTS_REG_MSK); 2754 IL49_SCD_QUEUE_STTS_REG_MSK);
2755 2755
2756 txq->sched_retry = scd_retry; 2756 txq->sched_retry = scd_retry;
2757 2757
@@ -3195,7 +3195,7 @@ static void __devexit il4965_pci_remove(struct pci_dev *pdev)
3195 */ 3195 */
3196void il4965_txq_set_sched(struct il_priv *il, u32 mask) 3196void il4965_txq_set_sched(struct il_priv *il, u32 mask)
3197{ 3197{
3198 il_wr_prph(il, IWL49_SCD_TXFACT, mask); 3198 il_wr_prph(il, IL49_SCD_TXFACT, mask);
3199} 3199}
3200 3200
3201/***************************************************************************** 3201/*****************************************************************************
@@ -3206,11 +3206,8 @@ void il4965_txq_set_sched(struct il_priv *il, u32 mask)
3206 3206
3207/* Hardware specific file defines the PCI IDs table for that hardware module */ 3207/* Hardware specific file defines the PCI IDs table for that hardware module */
3208static DEFINE_PCI_DEVICE_TABLE(il4965_hw_card_ids) = { 3208static DEFINE_PCI_DEVICE_TABLE(il4965_hw_card_ids) = {
3209#if defined(CONFIG_IWL4965_MODULE) || defined(CONFIG_IWL4965)
3210 {IL_PCI_DEVICE(0x4229, PCI_ANY_ID, il4965_cfg)}, 3209 {IL_PCI_DEVICE(0x4229, PCI_ANY_ID, il4965_cfg)},
3211 {IL_PCI_DEVICE(0x4230, PCI_ANY_ID, il4965_cfg)}, 3210 {IL_PCI_DEVICE(0x4230, PCI_ANY_ID, il4965_cfg)},
3212#endif /* CONFIG_IWL4965 */
3213
3214 {0} 3211 {0}
3215}; 3212};
3216MODULE_DEVICE_TABLE(pci, il4965_hw_card_ids); 3213MODULE_DEVICE_TABLE(pci, il4965_hw_card_ids);
@@ -3258,7 +3255,7 @@ static void __exit il4965_exit(void)
3258module_exit(il4965_exit); 3255module_exit(il4965_exit);
3259module_init(il4965_init); 3256module_init(il4965_init);
3260 3257
3261#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG 3258#ifdef CONFIG_IWLEGACY_DEBUG
3262module_param_named(debug, il_debug_level, uint, S_IRUGO | S_IWUSR); 3259module_param_named(debug, il_debug_level, uint, S_IRUGO | S_IWUSR);
3263MODULE_PARM_DESC(debug, "debug output mask"); 3260MODULE_PARM_DESC(debug, "debug output mask");
3264#endif 3261#endif
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-25 13:31:00 -0500