summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-09-02 19:30:07 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-09-02 19:30:07 +0200
commit78ab952717b62c0ba6ca7f7a27eaa0486685e45f (patch)
treea4ab2bfc578f279fc6847031f501d84c75057531 /drivers/net/wireless/iwlwifi/iwl-3945-hw.h
parentstarfire: Temporary kludge to fix powerpc build. (diff)
parentmac80211: only cancel software-based scans on suspend (diff)
downloadlinux-78ab952717b62c0ba6ca7f7a27eaa0486685e45f.tar.xz
linux-78ab952717b62c0ba6ca7f7a27eaa0486685e45f.zip
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.h3
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 @@
*****************************************************************************/
/*
* Please use this file (iwl-3945-hw.h) only for hardware-related definitions.
- * Please use iwl-3945-commands.h for uCode API definitions.
+ * Please use iwl-commands.h for uCode API definitions.
* Please use iwl-3945.h for driver implementation definitions.
*/
@@ -226,6 +226,7 @@ struct iwl3945_eeprom {
/* 4 DATA + 1 CMD. There are 2 HCCA queues that are not used. */
#define IWL39_NUM_QUEUES 5
+#define IWL39_CMD_QUEUE_NUM 4
#define IWL_DEFAULT_TX_RETRY 15