Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / iwlwifi / iwl-4965-rs.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index 4b46226ff350bafe85be6a66f764083ff3fec134..b608e1ca8b4062fdd101a7c56d2868bcce7cd9a6 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@ -36,9 +36,10 @@
 
 #include <linux/workqueue.h>
 
-#include "../net/mac80211/ieee80211_rate.h"
+#include "../net/mac80211/rate.h"
 
 #include "iwl-4965.h"
+#include "iwl-core.h"
 #include "iwl-helpers.h"
 
 #define RS_NAME "iwl-4965-rs"
@@ -149,7 +150,7 @@ struct iwl4965_lq_sta {
        u16 active_mimo_rate;
        u16 active_rate_basic;
 
-       struct iwl4965_link_quality_cmd lq;
+       struct iwl_link_quality_cmd lq;
        struct iwl4965_scale_tbl_info lq_info[LQ_SIZE]; /* "active", "search" */
 #ifdef CONFIG_IWL4965_HT
        struct iwl4965_traffic_load load[TID_MAX_LOAD_COUNT];
@@ -162,17 +163,17 @@ struct iwl4965_lq_sta {
        struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;
 #endif
        struct iwl4965_rate dbg_fixed;
-       struct iwl4965_priv *drv;
+       struct iwl_priv *drv;
 #endif
 };
 
-static void rs_rate_scale_perform(struct iwl4965_priv *priv,
+static void rs_rate_scale_perform(struct iwl_priv *priv,
                                   struct net_device *dev,
                                   struct ieee80211_hdr *hdr,
                                   struct sta_info *sta);
 static void rs_fill_link_cmd(struct iwl4965_lq_sta *lq_sta,
                             struct iwl4965_rate *tx_mcs,
-                            struct iwl4965_link_quality_cmd *tbl);
+                            struct iwl_link_quality_cmd *tbl);
 
 
 #ifdef CONFIG_MAC80211_DEBUGFS
@@ -229,58 +230,11 @@ static s32 expected_tpt_mimo40MHzSGI[IWL_RATE_COUNT] = {
        0, 0, 0, 0, 131, 131, 191, 222, 242, 270, 284, 289, 293
 };
 
-static int iwl4965_lq_sync_callback(struct iwl4965_priv *priv,
-                               struct iwl4965_cmd *cmd, struct sk_buff *skb)
-{
-       /*We didn't cache the SKB; let the caller free it */
-       return 1;
-}
-
 static inline u8 iwl4965_rate_get_rate(u32 rate_n_flags)
 {
        return (u8)(rate_n_flags & 0xFF);
 }
 
-static int rs_send_lq_cmd(struct iwl4965_priv *priv,
-                         struct iwl4965_link_quality_cmd *lq, u8 flags)
-{
-#ifdef CONFIG_IWL4965_DEBUG
-       int i;
-#endif
-       struct iwl4965_host_cmd cmd = {
-               .id = REPLY_TX_LINK_QUALITY_CMD,
-               .len = sizeof(struct iwl4965_link_quality_cmd),
-               .meta.flags = flags,
-               .data = lq,
-       };
-
-       if ((lq->sta_id == 0xFF) &&
-           (priv->iw_mode == IEEE80211_IF_TYPE_IBSS))
-               return -EINVAL;
-
-       if (lq->sta_id == 0xFF)
-               lq->sta_id = IWL_AP_ID;
-
-       IWL_DEBUG_RATE("lq station id 0x%x\n", lq->sta_id);
-       IWL_DEBUG_RATE("lq dta 0x%X 0x%X\n",
-                      lq->general_params.single_stream_ant_msk,
-                      lq->general_params.dual_stream_ant_msk);
-#ifdef CONFIG_IWL4965_DEBUG
-       for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)
-               IWL_DEBUG_RATE("lq index %d 0x%X\n",
-                               i, lq->rs_table[i].rate_n_flags);
-#endif
-
-       if (flags & CMD_ASYNC)
-               cmd.meta.u.callback = iwl4965_lq_sync_callback;
-
-       if (iwl4965_is_associated(priv) && priv->assoc_station_added &&
-           priv->lq_mngr.lq_ready)
-               return  iwl4965_send_cmd(priv, &cmd);
-
-       return 0;
-}
-
 static void rs_rate_scale_clear_window(struct iwl4965_rate_scale_data *window)
 {
        window->data = 0;
@@ -388,7 +342,7 @@ static u32 rs_tl_get_load(struct iwl4965_lq_sta *lq_data, u8 tid)
        return tl->total;
 }
 
-static void rs_tl_turn_on_agg_for_tid(struct iwl4965_priv *priv,
+static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
                                struct iwl4965_lq_sta *lq_data, u8 tid,
                                struct sta_info *sta)
 {
@@ -396,7 +350,7 @@ static void rs_tl_turn_on_agg_for_tid(struct iwl4965_priv *priv,
        DECLARE_MAC_BUF(mac);
 
        spin_lock_bh(&sta->ampdu_mlme.ampdu_tx);
-       state = sta->ampdu_mlme.tid_tx[tid].state;
+       state = sta->ampdu_mlme.tid_state_tx[tid];
        spin_unlock_bh(&sta->ampdu_mlme.ampdu_tx);
 
        if (state == HT_AGG_STATE_IDLE &&
@@ -407,7 +361,7 @@ static void rs_tl_turn_on_agg_for_tid(struct iwl4965_priv *priv,
        }
 }
 
-static void rs_tl_turn_on_agg(struct iwl4965_priv *priv, u8 tid,
+static void rs_tl_turn_on_agg(struct iwl_priv *priv, u8 tid,
                                struct iwl4965_lq_sta *lq_data,
                                struct sta_info *sta)
 {
@@ -658,7 +612,7 @@ static inline void rs_toggle_antenna(struct iwl4965_rate *new_rate,
        }
 }
 
-static inline u8 rs_use_green(struct iwl4965_priv *priv,
+static inline u8 rs_use_green(struct iwl_priv *priv,
                              struct ieee80211_conf *conf)
 {
 #ifdef CONFIG_IWL4965_HT
@@ -818,10 +772,10 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev,
        u8 retries;
        int rs_index, index = 0;
        struct iwl4965_lq_sta *lq_sta;
-       struct iwl4965_link_quality_cmd *table;
+       struct iwl_link_quality_cmd *table;
        struct sta_info *sta;
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-       struct iwl4965_priv *priv = (struct iwl4965_priv *)priv_rate;
+       struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
        struct ieee80211_hw *hw = local_to_hw(local);
        struct iwl4965_rate_scale_data *window = NULL;
@@ -1128,7 +1082,7 @@ static void rs_get_expected_tpt_table(struct iwl4965_lq_sta *lq_sta,
  * to decrease to match "active" throughput.  When moving from MIMO to SISO,
  * bit rate will typically need to increase, but not if performance was bad.
  */
-static s32 rs_get_best_rate(struct iwl4965_priv *priv,
+static s32 rs_get_best_rate(struct iwl_priv *priv,
                            struct iwl4965_lq_sta *lq_sta,
                            struct iwl4965_scale_tbl_info *tbl, /* "search" */
                            u16 rate_mask, s8 index, s8 rate)
@@ -1226,7 +1180,7 @@ static inline u8 rs_is_both_ant_supp(u8 valid_antenna)
 /*
  * Set up search table for MIMO
  */
-static int rs_switch_to_mimo(struct iwl4965_priv *priv,
+static int rs_switch_to_mimo(struct iwl_priv *priv,
                             struct iwl4965_lq_sta *lq_sta,
                             struct ieee80211_conf *conf,
                             struct sta_info *sta,
@@ -1291,7 +1245,7 @@ static int rs_switch_to_mimo(struct iwl4965_priv *priv,
 /*
  * Set up search table for SISO
  */
-static int rs_switch_to_siso(struct iwl4965_priv *priv,
+static int rs_switch_to_siso(struct iwl_priv *priv,
                             struct iwl4965_lq_sta *lq_sta,
                             struct ieee80211_conf *conf,
                             struct sta_info *sta,
@@ -1354,7 +1308,7 @@ static int rs_switch_to_siso(struct iwl4965_priv *priv,
 /*
  * Try to switch to new modulation mode from legacy
  */
-static int rs_move_legacy_other(struct iwl4965_priv *priv,
+static int rs_move_legacy_other(struct iwl_priv *priv,
                                struct iwl4965_lq_sta *lq_sta,
                                struct ieee80211_conf *conf,
                                struct sta_info *sta,
@@ -1452,7 +1406,7 @@ static int rs_move_legacy_other(struct iwl4965_priv *priv,
 /*
  * Try to switch to new modulation mode from SISO
  */
-static int rs_move_siso_to_other(struct iwl4965_priv *priv,
+static int rs_move_siso_to_other(struct iwl_priv *priv,
                                 struct iwl4965_lq_sta *lq_sta,
                                 struct ieee80211_conf *conf,
                                 struct sta_info *sta,
@@ -1548,7 +1502,7 @@ static int rs_move_siso_to_other(struct iwl4965_priv *priv,
 /*
  * Try to switch to new modulation mode from MIMO
  */
-static int rs_move_mimo_to_other(struct iwl4965_priv *priv,
+static int rs_move_mimo_to_other(struct iwl_priv *priv,
                                 struct iwl4965_lq_sta *lq_sta,
                                 struct ieee80211_conf *conf,
                                 struct sta_info *sta,
@@ -1728,7 +1682,7 @@ static void rs_stay_in_table(struct iwl4965_lq_sta *lq_sta)
 /*
  * Do rate scaling and search for new modulation mode.
  */
-static void rs_rate_scale_perform(struct iwl4965_priv *priv,
+static void rs_rate_scale_perform(struct iwl_priv *priv,
                                  struct net_device *dev,
                                  struct ieee80211_hdr *hdr,
                                  struct sta_info *sta)
@@ -1878,7 +1832,7 @@ static void rs_rate_scale_perform(struct iwl4965_priv *priv,
                if (update_lq) {
                        rs_mcs_from_tbl(&mcs_rate, tbl, index, is_green);
                        rs_fill_link_cmd(lq_sta, &mcs_rate, &lq_sta->lq);
-                       rs_send_lq_cmd(priv, &lq_sta->lq, CMD_ASYNC);
+                       iwl_send_lq_cmd(priv, &lq_sta->lq, CMD_ASYNC);
                }
                goto out;
 
@@ -2043,7 +1997,7 @@ static void rs_rate_scale_perform(struct iwl4965_priv *priv,
        if (update_lq) {
                rs_mcs_from_tbl(&mcs_rate, tbl, index, is_green);
                rs_fill_link_cmd(lq_sta, &mcs_rate, &lq_sta->lq);
-               rs_send_lq_cmd(priv, &lq_sta->lq, CMD_ASYNC);
+               iwl_send_lq_cmd(priv, &lq_sta->lq, CMD_ASYNC);
        }
 
        /* Should we stay with this modulation mode, or search for a new one? */
@@ -2083,7 +2037,7 @@ static void rs_rate_scale_perform(struct iwl4965_priv *priv,
                                     tbl->current_rate.rate_n_flags, index);
                        rs_fill_link_cmd(lq_sta, &tbl->current_rate,
                                         &lq_sta->lq);
-                       rs_send_lq_cmd(priv, &lq_sta->lq, CMD_ASYNC);
+                       iwl_send_lq_cmd(priv, &lq_sta->lq, CMD_ASYNC);
                }
 
                /* If the "active" (non-search) mode was legacy,
@@ -2148,7 +2102,7 @@ out:
 }
 
 
-static void rs_initialize_lq(struct iwl4965_priv *priv,
+static void rs_initialize_lq(struct iwl_priv *priv,
                             struct ieee80211_conf *conf,
                             struct sta_info *sta)
 {
@@ -2196,7 +2150,7 @@ static void rs_initialize_lq(struct iwl4965_priv *priv,
        tbl->current_rate.rate_n_flags = mcs_rate.rate_n_flags;
        rs_get_expected_tpt_table(lq_sta, tbl);
        rs_fill_link_cmd(lq_sta, &mcs_rate, &lq_sta->lq);
-       rs_send_lq_cmd(priv, &lq_sta->lq, CMD_ASYNC);
+       iwl_send_lq_cmd(priv, &lq_sta->lq, CMD_ASYNC);
  out:
        return;
 }
@@ -2213,7 +2167,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
        struct sta_info *sta;
        u16 fc;
-       struct iwl4965_priv *priv = (struct iwl4965_priv *)priv_rate;
+       struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
        struct iwl4965_lq_sta *lq_sta;
 
        IWL_DEBUG_RATE_LIMIT("rate scale calculate new rate for skb\n");
@@ -2294,7 +2248,7 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,
        int i, j;
        struct ieee80211_conf *conf = &local->hw.conf;
        struct ieee80211_supported_band *sband;
-       struct iwl4965_priv *priv = (struct iwl4965_priv *)priv_rate;
+       struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
        struct iwl4965_lq_sta *lq_sta = priv_sta;
 
        sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
@@ -2391,7 +2345,7 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,
 
 static void rs_fill_link_cmd(struct iwl4965_lq_sta *lq_sta,
                            struct iwl4965_rate *tx_mcs,
-                           struct iwl4965_link_quality_cmd *lq_cmd)
+                           struct iwl_link_quality_cmd *lq_cmd)
 {
        int index = 0;
        int rate_idx;
@@ -2516,7 +2470,7 @@ static void rs_free(void *priv_rate)
 
 static void rs_clear(void *priv_rate)
 {
-       struct iwl4965_priv *priv = (struct iwl4965_priv *) priv_rate;
+       struct iwl_priv *priv = (struct iwl_priv *) priv_rate;
 
        IWL_DEBUG_RATE("enter\n");
 
@@ -2590,7 +2544,7 @@ static ssize_t rs_sta_dbgfs_scale_table_write(struct file *file,
 
        if (lq_sta->dbg_fixed.rate_n_flags) {
                rs_fill_link_cmd(lq_sta, &lq_sta->dbg_fixed, &lq_sta->lq);
-               rs_send_lq_cmd(lq_sta->drv, &lq_sta->lq, CMD_ASYNC);
+               iwl_send_lq_cmd(lq_sta->drv, &lq_sta->lq, CMD_ASYNC);
        }
 
        return count;
@@ -2726,7 +2680,7 @@ static struct rate_control_ops rs_ops = {
 int iwl4965_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)
 {
        struct ieee80211_local *local = hw_to_local(hw);
-       struct iwl4965_priv *priv = hw->priv;
+       struct iwl_priv *priv = hw->priv;
        struct iwl4965_lq_sta *lq_sta;
        struct sta_info *sta;
        int cnt = 0, i;
@@ -2816,17 +2770,17 @@ int iwl4965_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)
 
 void iwl4965_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
 {
-       struct iwl4965_priv *priv = hw->priv;
+       struct iwl_priv *priv = hw->priv;
 
        priv->lq_mngr.lq_ready = 1;
 }
 
-void iwl4965_rate_control_register(struct ieee80211_hw *hw)
+int iwl4965_rate_control_register(void)
 {
-       ieee80211_rate_control_register(&rs_ops);
+       return ieee80211_rate_control_register(&rs_ops);
 }
 
-void iwl4965_rate_control_unregister(struct ieee80211_hw *hw)
+void iwl4965_rate_control_unregister(void)
 {
        ieee80211_rate_control_unregister(&rs_ops);
 }