iwlwifi: move command queue number out of the iwl_shared struct

The command queue number is required by the transport
layer, but it can be determined only by the op mode.
Move this parameter to the dvm op mode, and configure
the transport layer using an API.

Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 60f1dc640c94..1e6b5e41a72b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1236,6 +1236,14 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
          */
         trans_cfg.op_mode = op_mode;
 
+        if (ucode_flags & IWL_UCODE_TLV_FLAGS_PAN) {
+                priv->sta_key_max_num = STA_KEY_MAX_NUM_PAN;
+                trans_cfg.cmd_queue = IWL_IPAN_CMD_QUEUE_NUM;
+        } else {
+                priv->sta_key_max_num = STA_KEY_MAX_NUM;
+                trans_cfg.cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;
+        }
+
         /* Configure transport layer */
         iwl_trans_configure(trans(priv), &trans_cfg);
 
@@ -1336,14 +1344,6 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
         priv->new_scan_threshold_behaviour =
                 !!(ucode_flags & IWL_UCODE_TLV_FLAGS_NEWSCAN);
 
-        if (ucode_flags & IWL_UCODE_TLV_FLAGS_PAN) {
-                priv->sta_key_max_num = STA_KEY_MAX_NUM_PAN;
-                priv->shrd->cmd_queue = IWL_IPAN_CMD_QUEUE_NUM;
-        } else {
-                priv->sta_key_max_num = STA_KEY_MAX_NUM;
-                priv->shrd->cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;
-        }
-
         priv->phy_calib_chain_noise_reset_cmd =
                 fw->ucode_capa.standard_phy_calibration_size;
         priv->phy_calib_chain_noise_gain_cmd =