korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-23 19:14:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

iwlwifi: remove duplicated/unused definition

Browse Source 
"IWL_CMD_QUEUE_NUM" is being defined in multiple places and used by all
the devices. move it to iwl-dev.h file and shared by all the devices.

Remove "IWL_CMD_FIFO_NUM", replaced by "IWL49_CMD_FIFO_NUM" and IWL50_CMD_FIFO_NUM"

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Wey-Yi Guy 2009-10-09 13:20:23 -07:00 committed by John W. Linville
parent b660d3adb8
commit bd35f15082
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/iwlwifi/iwl-3945-hw.h
View File

@ -71,12 +71,6 @@
#include "iwl-eeprom.h" #include "iwl-eeprom.h"
/*
* uCode queue management definitions ...
* Queue #4 is the command queue for 3945 and 4965.
*/
#define IWL_CMD_QUEUE_NUM 4
/* Time constants */ /* Time constants */
#define SHORT_SLOT_TIME 9 #define SHORT_SLOT_TIME 9
#define LONG_SLOT_TIME 20 #define LONG_SLOT_TIME 20

3
drivers/net/wireless/iwlwifi/iwl-4965-hw.h
View File

@ -76,12 +76,9 @@
/* /*
* uCode queue management definitions ... * uCode queue management definitions ...
* Queue #4 is the command queue for 3945 and 4965; map it to Tx FIFO chnl 4.
* The first queue used for block-ack aggregation is #7 (4965 only). * The first queue used for block-ack aggregation is #7 (4965 only).
* All block-ack aggregation queues should map to Tx DMA/FIFO channel 7. * All block-ack aggregation queues should map to Tx DMA/FIFO channel 7.
*/ */
#define IWL_CMD_QUEUE_NUM 4
#define IWL_CMD_FIFO_NUM 4
#define IWL49_FIRST_AMPDU_QUEUE 7 #define IWL49_FIRST_AMPDU_QUEUE 7
/* Time constants */ /* Time constants */

6
drivers/net/wireless/iwlwifi/iwl-dev.h
View File

@ -323,6 +323,12 @@ struct iwl_channel_info {
* queue, 2 (unused) HCCA queues, and 4 HT queues (one for each AC) */ * queue, 2 (unused) HCCA queues, and 4 HT queues (one for each AC) */
#define IWL_MIN_NUM_QUEUES 10 #define IWL_MIN_NUM_QUEUES 10
/*
* uCode queue management definitions ...
* Queue #4 is the command queue for 3945/4965/5x00/1000/6x00.
*/
#define IWL_CMD_QUEUE_NUM 4
/* Power management (not Tx power) structures */ /* Power management (not Tx power) structures */
enum iwl_pwr_src { enum iwl_pwr_src {