1 files changed, 9 insertions, 20 deletions

diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
index 408132cf83c1..e3a07c916812 100644
--- a/drivers/net/wireless/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
@@ -511,7 +511,7 @@ static void iwl_bg_tx_flush(struct work_struct *work)
                 return;
 
         IWL_DEBUG_INFO(priv, "device request: flush all tx frames\n");
-        iwlagn_dev_txfifo_flush(priv, IWL_DROP_ALL);
+        iwlagn_dev_txfifo_flush(priv);
 }
 
 /*
@@ -1191,10 +1191,6 @@ static void iwl_option_config(struct iwl_priv *priv)
 
 static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
 {
-        u16 radio_cfg;
-
-        priv->eeprom_data->sku = priv->eeprom_data->sku;
-
         if (priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE &&
             !priv->cfg->ht_params) {
                 IWL_ERR(priv, "Invalid 11n configuration\n");
@@ -1206,9 +1202,7 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
                 return -EINVAL;
         }
 
-        IWL_INFO(priv, "Device SKU: 0x%X\n", priv->eeprom_data->sku);
-
-        radio_cfg = priv->eeprom_data->radio_cfg;
+        IWL_DEBUG_INFO(priv, "Device SKU: 0x%X\n", priv->eeprom_data->sku);
 
         priv->hw_params.tx_chains_num =
                 num_of_ant(priv->eeprom_data->valid_tx_ant);
@@ -1218,9 +1212,9 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
                 priv->hw_params.rx_chains_num =
                         num_of_ant(priv->eeprom_data->valid_rx_ant);
 
-        IWL_INFO(priv, "Valid Tx ant: 0x%X, Valid Rx ant: 0x%X\n",
-                 priv->eeprom_data->valid_tx_ant,
-                 priv->eeprom_data->valid_rx_ant);
+        IWL_DEBUG_INFO(priv, "Valid Tx ant: 0x%X, Valid Rx ant: 0x%X\n",
+                       priv->eeprom_data->valid_tx_ant,
+                       priv->eeprom_data->valid_rx_ant);
 
         return 0;
 }
@@ -1235,7 +1229,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
         struct iwl_op_mode *op_mode;
         u16 num_mac;
         u32 ucode_flags;
-        struct iwl_trans_config trans_cfg;
+        struct iwl_trans_config trans_cfg = {};
         static const u8 no_reclaim_cmds[] = {
                 REPLY_RX_PHY_CMD,
                 REPLY_RX_MPDU_CMD,
@@ -1334,6 +1328,9 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
         /* Configure transport layer */
         iwl_trans_configure(priv->trans, &trans_cfg);
 
+        trans->rx_mpdu_cmd = REPLY_RX_MPDU_CMD;
+        trans->rx_mpdu_cmd_hdr_size = sizeof(struct iwl_rx_mpdu_res_start);
+
         /* At this point both hw and priv are allocated. */
 
         SET_IEEE80211_DEV(priv->hw, priv->trans->dev);
@@ -1508,10 +1505,6 @@ static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)
 
         iwl_tt_exit(priv);
 
-        /*This will stop the queues, move the device to low power state */
-        priv->ucode_loaded = false;
-        iwl_trans_stop_device(priv->trans);
-
         kfree(priv->eeprom_blob);
         iwl_free_eeprom_data(priv->eeprom_data);
 
@@ -1927,8 +1920,6 @@ static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)
          * commands by clearing the ready bit */
         clear_bit(STATUS_READY, &priv->status);
 
-        wake_up(&priv->trans->wait_command_queue);
-
         if (!ondemand) {
                 /*
                  * If firmware keep reloading, then it indicate something
@@ -2152,8 +2143,6 @@ static int __init iwl_init(void)
 {
 
         int ret;
-        pr_info(DRV_DESCRIPTION ", " DRV_VERSION "\n");
-        pr_info(DRV_COPYRIGHT "\n");
 
         ret = iwlagn_rate_control_register();
         if (ret) {