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: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index 2199a0e5c4f001473f3d339e339b44fba53aea74..5039a9a47767a38778c7b1d01698d49badf37e61 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -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);

diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index 1ba020723537d3beb40a86fe667c6f9d10d82318..c1739626aeb45a607ff5ec05065ac0fa64ca458b 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -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);

diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index aebdfd7e01a53ae9e3ca16c03887137c8042aa67..fc6ec07de8776926c230d1dccb0f773012b44375 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -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) |

diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 150bef078609e8f15f2d70912c9cac65a7c60549..a64f0f2812493e3d8212bc1630b8e7b05deb89c8 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -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) |

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 7c3165ed85bc229f5ea67fb624659dc9755569df..8cf149cd20ca3ac506d7fb4b2c6822025bdefe78 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -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");

diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h
index 8ee528479c9561d63dc9f6a01993aaf47b3477e7..ab2e1f771a11016f3dada2705f985794735b76b2 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-shared.h
+++ b/drivers/net/wireless/iwlwifi/iwl-shared.h
@@ -115,7 +115,6 @@ extern struct iwl_mod_params iwlagn_mod_params;
  * Holds the module parameters
  *
  * @sw_crypto: using hardware encryption, default = 0
- * @num_of_queues: number of tx queue, HW dependent
  * @disable_11n: disable 11n capabilities, default = 0,
  *     use IWL_DISABLE_HT_* constants
  * @amsdu_size_8K: enable 8K amsdu size, default = 1
@@ -137,7 +136,6 @@ extern struct iwl_mod_params iwlagn_mod_params;
  */
 struct iwl_mod_params {
        int sw_crypto;
-       int num_of_queues;
        unsigned int disable_11n;
        int amsdu_size_8K;
        int antenna;