Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9eae88fa authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: move queue mapping out of transport 



The queue mapping is not only dynamic, it
is also dependent on the uCode, as we can
already see today with the dual-mode and
non-dual-mode being different.

Move the queue mapping out of the transport
layer and let the higher layer manage it.
Part of the transport configuration is how
to set up the queues.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e5610382

drivers/net/wireless/iwlwifi/iwl-1000.c

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ static struct iwl_lib_ops iwl1000_lib = { 


static const struct iwl_base_params iwl1000_base_params = {

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.max_ll_items = OTP_MAX_LL_ITEMS_1000,

drivers/net/wireless/iwlwifi/iwl-2000.c

+0 −2
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ static struct iwl_lib_ops iwl2030_lib = { 
static const struct iwl_base_params iwl2000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = 0,

	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,

	.shadow_ram_support = true,
@@ -190,7 +189,6 @@ static const struct iwl_base_params iwl2000_base_params = { 
static const struct iwl_base_params iwl2030_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = 0,

	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,

	.shadow_ram_support = true,

drivers/net/wireless/iwlwifi/iwl-5000.c

+0 −1
Original line number Diff line number Diff line
@@ -308,7 +308,6 @@ static struct iwl_lib_ops iwl5150_lib = { 
static const struct iwl_base_params iwl5000_base_params = {

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.led_compensation = 51,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

drivers/net/wireless/iwlwifi/iwl-6000.c

+0 −3
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ static struct iwl_lib_ops iwl6030_lib = { 
static const struct iwl_base_params iwl6000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = 0,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,

	.shadow_ram_support = true,
@@ -286,7 +285,6 @@ static const struct iwl_base_params iwl6000_base_params = { 
static const struct iwl_base_params iwl6050_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = 0,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x50,

	.shadow_ram_support = true,
@@ -303,7 +301,6 @@ static const struct iwl_base_params iwl6050_base_params = { 
static const struct iwl_base_params iwl6000_g2_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = 0,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,

	.shadow_ram_support = true,

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

+0 −3
Original line number Diff line number Diff line
@@ -103,9 +103,6 @@ 
/* EEPROM */

#define IWLAGN_EEPROM_IMG_SIZE		2048



#define IWLAGN_CMD_FIFO_NUM		7

#define IWLAGN_NUM_QUEUES		20

#define IWLAGN_NUM_AMPDU_QUEUES		9

#define IWLAGN_FIRST_AMPDU_QUEUE	11



#endif /* __iwl_agn_hw_h__ */