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

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

iwlwifi: remove num_of_queues module parameter 



This is a hardware parameter, so it shouldn't
be configurable by the user. Users can disable
aggregation (which is the only thing affected)
with 11n_disable.

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 1b29dc94

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

+0 −5
Original line number Diff line number Diff line
@@ -122,11 +122,6 @@ static struct iwl_sensitivity_ranges iwl1000_sensitivity = { 


static void iwl1000_hw_set_hw_params(struct iwl_priv *priv)

{

	if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)

		cfg(priv)->base_params->num_of_queues =

			iwlagn_mod_params.num_of_queues;



	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;



	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ);

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

+0 −5
Original line number Diff line number Diff line
@@ -118,11 +118,6 @@ static struct iwl_sensitivity_ranges iwl2000_sensitivity = { 


static void iwl2000_hw_set_hw_params(struct iwl_priv *priv)

{

	if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)

		cfg(priv)->base_params->num_of_queues =

			iwlagn_mod_params.num_of_queues;



	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;



	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ);

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

+0 −10
Original line number Diff line number Diff line
@@ -157,11 +157,6 @@ static void iwl5000_set_ct_threshold(struct iwl_priv *priv) 


static void iwl5000_hw_set_hw_params(struct iwl_priv *priv)

{

	if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)

		cfg(priv)->base_params->num_of_queues =

			iwlagn_mod_params.num_of_queues;



	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;



	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
@@ -180,11 +175,6 @@ static void iwl5000_hw_set_hw_params(struct iwl_priv *priv) 


static void iwl5150_hw_set_hw_params(struct iwl_priv *priv)

{

	if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)

		cfg(priv)->base_params->num_of_queues =

			iwlagn_mod_params.num_of_queues;



	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;



	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |

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

+0 −5
Original line number Diff line number Diff line
@@ -139,11 +139,6 @@ static struct iwl_sensitivity_ranges iwl6000_sensitivity = { 


static void iwl6000_hw_set_hw_params(struct iwl_priv *priv)

{

	if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)

		cfg(priv)->base_params->num_of_queues =

			iwlagn_mod_params.num_of_queues;



	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;



	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |

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

+0 −2
Original line number Diff line number Diff line
@@ -1471,8 +1471,6 @@ MODULE_PARM_DESC(debug, "debug output mask"); 


module_param_named(swcrypto, iwlagn_mod_params.sw_crypto, int, S_IRUGO);

MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])");

module_param_named(queues_num, iwlagn_mod_params.num_of_queues, int, S_IRUGO);

MODULE_PARM_DESC(queues_num, "number of hw queues.");

module_param_named(11n_disable, iwlagn_mod_params.disable_11n, uint, S_IRUGO);

MODULE_PARM_DESC(11n_disable,

	"disable 11n functionality, bitmap: 1: full, 2: agg TX, 4: agg RX");