diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-09-02 13:30:07 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-02 13:30:07 -0400 |
| commit | 78ab952717b62c0ba6ca7f7a27eaa0486685e45f (patch) | |
| tree | a4ab2bfc578f279fc6847031f501d84c75057531 /drivers/net/wireless/iwlwifi/iwl-3945-hw.h | |
| parent | 3e502e63586920f219ed2590f69c1f5a8888cfa4 (diff) | |
| parent | 85f72bc839705294b32b6c16b491c0422f0a71b3 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945-hw.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h index 7c731a793632..65b5834da28c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h +++ b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h | |||
| @@ -62,7 +62,7 @@ | |||
| 62 | *****************************************************************************/ | 62 | *****************************************************************************/ |
| 63 | /* | 63 | /* |
| 64 | * Please use this file (iwl-3945-hw.h) only for hardware-related definitions. | 64 | * Please use this file (iwl-3945-hw.h) only for hardware-related definitions. |
| 65 | * Please use iwl-3945-commands.h for uCode API definitions. | 65 | * Please use iwl-commands.h for uCode API definitions. |
| 66 | * Please use iwl-3945.h for driver implementation definitions. | 66 | * Please use iwl-3945.h for driver implementation definitions. |
| 67 | */ | 67 | */ |
| 68 | 68 | ||
| @@ -226,6 +226,7 @@ struct iwl3945_eeprom { | |||
| 226 | 226 | ||
| 227 | /* 4 DATA + 1 CMD. There are 2 HCCA queues that are not used. */ | 227 | /* 4 DATA + 1 CMD. There are 2 HCCA queues that are not used. */ |
| 228 | #define IWL39_NUM_QUEUES 5 | 228 | #define IWL39_NUM_QUEUES 5 |
| 229 | #define IWL39_CMD_QUEUE_NUM 4 | ||
| 229 | 230 | ||
| 230 | #define IWL_DEFAULT_TX_RETRY 15 | 231 | #define IWL_DEFAULT_TX_RETRY 15 |
| 231 | 232 | ||