Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index 65386e575b1c..1ef3b7106ad5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -168,7 +168,7 @@ int iwl_send_add_sta(struct iwl_priv *priv,
         }
 
         cmd.len[0] = iwlagn_build_addsta_hcmd(sta, data);
-        ret = trans_send_cmd(priv, &cmd);
+        ret = trans_send_cmd(&priv->trans, &cmd);
 
         if (ret || (flags & CMD_ASYNC))
                 return ret;
@@ -424,7 +424,7 @@ static int iwl_send_remove_station(struct iwl_priv *priv,
 
         cmd.flags |= CMD_WANT_SKB;
 
-        ret = trans_send_cmd(priv, &cmd);
+        ret = trans_send_cmd(&priv->trans, &cmd);
 
         if (ret)
                 return ret;
@@ -669,7 +669,7 @@ void iwl_reprogram_ap_sta(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
         iwl_send_lq_cmd(priv, ctx, &lq, CMD_SYNC, true);
 }
 
-int iwl_get_free_ucode_key_index(struct iwl_priv *priv)
+int iwl_get_free_ucode_key_offset(struct iwl_priv *priv)
 {
         int i;
 
@@ -793,7 +793,7 @@ int iwl_send_lq_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
                 return -EINVAL;
 
         if (is_lq_table_valid(priv, ctx, lq))
-                ret = trans_send_cmd(priv, &cmd);
+                ret = trans_send_cmd(&priv->trans, &cmd);
         else
                 ret = -EINVAL;