diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-12-18 21:37:02 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 15:58:51 -0500 |
commit | 69d00d2722e7478e590e40b1a8b791b4aeea195f (patch) | |
tree | 6ca4eea8b7d4911356a9ca080442c9efc8aba8f9 /drivers/net/wireless/iwlwifi | |
parent | bddadf86fb284f237d6e2d3496772c8f5c68370e (diff) |
iwlwifi: 3945 unfold iwl-3945-commands.h
This patch unfolds includes of iwl-3945-commands.h
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945-commands.h | 5 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 10 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945-led.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 1 |
6 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-commands.h b/drivers/net/wireless/iwlwifi/iwl-3945-commands.h index c6f4eb54a2b1..e9ccd07db8d4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-3945-commands.h | |||
@@ -144,6 +144,11 @@ enum { | |||
144 | REPLY_MAX = 0xff | 144 | REPLY_MAX = 0xff |
145 | }; | 145 | }; |
146 | 146 | ||
147 | /* Tx rates */ | ||
148 | #define IWL_CCK_RATES 4 | ||
149 | #define IWL_OFDM_RATES 8 | ||
150 | #define IWL_MAX_RATES (IWL_CCK_RATES + IWL_OFDM_RATES) | ||
151 | |||
147 | /****************************************************************************** | 152 | /****************************************************************************** |
148 | * (0) | 153 | * (0) |
149 | * Commonly used structures and definitions: | 154 | * Commonly used structures and definitions: |
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h index 1df385b7c39e..21719eb7e144 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h +++ b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h | |||
@@ -73,13 +73,7 @@ | |||
73 | * uCode queue management definitions ... | 73 | * uCode queue management definitions ... |
74 | * Queue #4 is the command queue for 3945 and 4965. | 74 | * Queue #4 is the command queue for 3945 and 4965. |
75 | */ | 75 | */ |
76 | #define IWL_CMD_QUEUE_NUM 4 | 76 | #define IWL_CMD_QUEUE_NUM 4 |
77 | |||
78 | /* Tx rates */ | ||
79 | #define IWL_CCK_RATES 4 | ||
80 | #define IWL_OFDM_RATES 8 | ||
81 | #define IWL_HT_RATES 0 | ||
82 | #define IWL_MAX_RATES (IWL_CCK_RATES+IWL_OFDM_RATES+IWL_HT_RATES) | ||
83 | 77 | ||
84 | /* Time constants */ | 78 | /* Time constants */ |
85 | #define SHORT_SLOT_TIME 9 | 79 | #define SHORT_SLOT_TIME 9 |
@@ -281,8 +275,6 @@ struct iwl3945_eeprom { | |||
281 | /* End of EEPROM */ | 275 | /* End of EEPROM */ |
282 | 276 | ||
283 | 277 | ||
284 | #include "iwl-3945-commands.h" | ||
285 | |||
286 | #define PCI_LINK_CTRL 0x0F0 | 278 | #define PCI_LINK_CTRL 0x0F0 |
287 | #define PCI_POWER_SOURCE 0x0C8 | 279 | #define PCI_POWER_SOURCE 0x0C8 |
288 | #define PCI_REG_WUM8 0x0E8 | 280 | #define PCI_REG_WUM8 0x0E8 |
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-led.c b/drivers/net/wireless/iwlwifi/iwl-3945-led.c index 4c638909a7db..b0d420f68ec4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945-led.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945-led.c | |||
@@ -38,8 +38,8 @@ | |||
38 | #include <linux/etherdevice.h> | 38 | #include <linux/etherdevice.h> |
39 | #include <asm/unaligned.h> | 39 | #include <asm/unaligned.h> |
40 | 40 | ||
41 | #include "iwl-3945-commands.h" | ||
41 | #include "iwl-3945.h" | 42 | #include "iwl-3945.h" |
42 | #include "iwl-helpers.h" | ||
43 | 43 | ||
44 | 44 | ||
45 | static const struct { | 45 | static const struct { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c index 21c841847d88..56226032333a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c | |||
@@ -36,6 +36,7 @@ | |||
36 | 36 | ||
37 | #include <linux/workqueue.h> | 37 | #include <linux/workqueue.h> |
38 | 38 | ||
39 | #include "iwl-3945-commands.h" | ||
39 | #include "iwl-3945.h" | 40 | #include "iwl-3945.h" |
40 | 41 | ||
41 | #define RS_NAME "iwl-3945-rs" | 42 | #define RS_NAME "iwl-3945-rs" |
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index f4fee0a91b66..5a316d501c32 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
@@ -40,6 +40,7 @@ | |||
40 | 40 | ||
41 | #include "iwl-3945-core.h" | 41 | #include "iwl-3945-core.h" |
42 | #include "iwl-3945-fh.h" | 42 | #include "iwl-3945-fh.h" |
43 | #include "iwl-3945-commands.h" | ||
43 | #include "iwl-3945.h" | 44 | #include "iwl-3945.h" |
44 | #include "iwl-helpers.h" | 45 | #include "iwl-helpers.h" |
45 | #include "iwl-3945-rs.h" | 46 | #include "iwl-3945-rs.h" |
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index fee3e93ca564..541cdbe8172f 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -47,6 +47,7 @@ | |||
47 | #include <asm/div64.h> | 47 | #include <asm/div64.h> |
48 | 48 | ||
49 | #include "iwl-3945-core.h" | 49 | #include "iwl-3945-core.h" |
50 | #include "iwl-3945-commands.h" | ||
50 | #include "iwl-3945.h" | 51 | #include "iwl-3945.h" |
51 | #include "iwl-3945-fh.h" | 52 | #include "iwl-3945-fh.h" |
52 | #include "iwl-helpers.h" | 53 | #include "iwl-helpers.h" |