Commit bd35f150 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: remove duplicated/unused definition 



"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: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b660d3ad

drivers/net/wireless/iwlwifi/iwl-3945-hw.h

+0 −6
Original line number Diff line number Diff line
@@ -71,12 +71,6 @@ 


#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 */

#define SHORT_SLOT_TIME 9

#define LONG_SLOT_TIME 20

drivers/net/wireless/iwlwifi/iwl-4965-hw.h

+0 −3
Original line number Diff line number Diff line
@@ -76,12 +76,9 @@ 


/*

 * 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).

 * 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



/* Time constants */

drivers/net/wireless/iwlwifi/iwl-dev.h

+6 −0
Original line number Diff line number Diff line
@@ -323,6 +323,12 @@ struct iwl_channel_info { 
 * queue, 2 (unused) HCCA queues, and 4 HT queues (one for each AC) */

#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 */



enum iwl_pwr_src {