1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c
index d6d28d7b442b..ba078a3322b8 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rs.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -24,7 +24,6 @@
  *
  *****************************************************************************/
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 #include <net/mac80211.h>
@@ -700,7 +699,7 @@ static int rs_rate_from_ucode_rate(const u32 ucode_rate,
         u8 num_of_ant = get_num_of_ant_from_rate(ucode_rate);
         u8 nss;
 
-        memset(rate, 0, sizeof(struct rs_rate));
+        memset(rate, 0, sizeof(*rate));
         rate->index = iwl_hwrate_to_plcp_idx(ucode_rate);
 
         if (rate->index == IWL_RATE_INVALID) {
@@ -2121,7 +2120,7 @@ static void rs_initialize_lq(struct iwl_mvm *mvm,
                 tbl->column = RS_COLUMN_LEGACY_ANT_B;
 
         rs_set_expected_tpt_table(lq_sta, tbl);
-        rs_fill_lq_cmd(NULL, NULL, lq_sta, rate);
+        rs_fill_lq_cmd(mvm, sta, lq_sta, rate);
         /* TODO restore station should remember the lq cmd */
         iwl_mvm_send_lq_cmd(mvm, &lq_sta->lq, init);
 }
@@ -2446,10 +2445,9 @@ static void rs_build_rates_table(struct iwl_mvm *mvm,
         struct iwl_lq_cmd *lq_cmd = &lq_sta->lq;
         bool toggle_ant = false;
 
-        memcpy(&rate, initial_rate, sizeof(struct rs_rate));
+        memcpy(&rate, initial_rate, sizeof(rate));
 
-        if (mvm)
-                valid_tx_ant = iwl_fw_valid_tx_ant(mvm->fw);
+        valid_tx_ant = iwl_fw_valid_tx_ant(mvm->fw);
 
         if (is_siso(&rate)) {
                 num_rates = RS_INITIAL_SISO_NUM_RATES;
@@ -2623,7 +2621,7 @@ static void rs_program_fix_rate(struct iwl_mvm *mvm,
                 struct rs_rate rate;
                 rs_rate_from_ucode_rate(lq_sta->dbg_fixed_rate,
                                         lq_sta->band, &rate);
-                rs_fill_lq_cmd(NULL, NULL, lq_sta, &rate);
+                rs_fill_lq_cmd(mvm, NULL, lq_sta, &rate);
                 iwl_mvm_send_lq_cmd(lq_sta->drv, &lq_sta->lq, false);
         }
 }