iwlegacy: rename iwl to il
iwl_legacy prefix result in long function names, what cause that we
have frequent line split and not readable code. Also iwl_foo symbols
are duplicated in iwlwifi driver, what is annoying when editing
kernel tree with cscope.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c b/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
index 57ebe21..a7298f5 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
@@ -43,26 +43,26 @@
#define IWL4965_RS_NAME "iwl-4965-rs"
#define NUM_TRY_BEFORE_ANT_TOGGLE 1
-#define IWL_NUMBER_TRY 1
-#define IWL_HT_NUMBER_TRY 3
+#define IL_NUMBER_TRY 1
+#define IL_HT_NUMBER_TRY 3
-#define IWL_RATE_MAX_WINDOW 62 /* # tx in history window */
-#define IWL_RATE_MIN_FAILURE_TH 6 /* min failures to calc tpt */
-#define IWL_RATE_MIN_SUCCESS_TH 8 /* min successes to calc tpt */
+#define IL_RATE_MAX_WINDOW 62 /* # tx in history window */
+#define IL_RATE_MIN_FAILURE_TH 6 /* min failures to calc tpt */
+#define IL_RATE_MIN_SUCCESS_TH 8 /* min successes to calc tpt */
/* max allowed rate miss before sync LQ cmd */
-#define IWL_MISSED_RATE_MAX 15
+#define IL_MISSED_RATE_MAX 15
/* max time to accum history 2 seconds */
-#define IWL_RATE_SCALE_FLUSH_INTVL (3*HZ)
+#define IL_RATE_SCALE_FLUSH_INTVL (3*HZ)
static u8 rs_ht_to_legacy[] = {
- IWL_RATE_6M_INDEX, IWL_RATE_6M_INDEX,
- IWL_RATE_6M_INDEX, IWL_RATE_6M_INDEX,
- IWL_RATE_6M_INDEX,
- IWL_RATE_6M_INDEX, IWL_RATE_9M_INDEX,
- IWL_RATE_12M_INDEX, IWL_RATE_18M_INDEX,
- IWL_RATE_24M_INDEX, IWL_RATE_36M_INDEX,
- IWL_RATE_48M_INDEX, IWL_RATE_54M_INDEX
+ IL_RATE_6M_INDEX, IL_RATE_6M_INDEX,
+ IL_RATE_6M_INDEX, IL_RATE_6M_INDEX,
+ IL_RATE_6M_INDEX,
+ IL_RATE_6M_INDEX, IL_RATE_9M_INDEX,
+ IL_RATE_12M_INDEX, IL_RATE_18M_INDEX,
+ IL_RATE_24M_INDEX, IL_RATE_36M_INDEX,
+ IL_RATE_48M_INDEX, IL_RATE_54M_INDEX
};
static const u8 ant_toggle_lookup[] = {
@@ -76,43 +76,43 @@
/*ANT_ABC -> */ ANT_ABC,
};
-#define IWL_DECLARE_RATE_INFO(r, s, ip, in, rp, rn, pp, np) \
- [IWL_RATE_##r##M_INDEX] = { IWL_RATE_##r##M_PLCP, \
- IWL_RATE_SISO_##s##M_PLCP, \
- IWL_RATE_MIMO2_##s##M_PLCP,\
- IWL_RATE_##r##M_IEEE, \
- IWL_RATE_##ip##M_INDEX, \
- IWL_RATE_##in##M_INDEX, \
- IWL_RATE_##rp##M_INDEX, \
- IWL_RATE_##rn##M_INDEX, \
- IWL_RATE_##pp##M_INDEX, \
- IWL_RATE_##np##M_INDEX }
+#define IL_DECLARE_RATE_INFO(r, s, ip, in, rp, rn, pp, np) \
+ [IL_RATE_##r##M_INDEX] = { IL_RATE_##r##M_PLCP, \
+ IL_RATE_SISO_##s##M_PLCP, \
+ IL_RATE_MIMO2_##s##M_PLCP,\
+ IL_RATE_##r##M_IEEE, \
+ IL_RATE_##ip##M_INDEX, \
+ IL_RATE_##in##M_INDEX, \
+ IL_RATE_##rp##M_INDEX, \
+ IL_RATE_##rn##M_INDEX, \
+ IL_RATE_##pp##M_INDEX, \
+ IL_RATE_##np##M_INDEX }
/*
* Parameter order:
* rate, ht rate, prev rate, next rate, prev tgg rate, next tgg rate
*
* If there isn't a valid next or previous rate then INV is used which
- * maps to IWL_RATE_INVALID
+ * maps to IL_RATE_INVALID
*
*/
-const struct iwl_rate_info iwlegacy_rates[IWL_RATE_COUNT] = {
- IWL_DECLARE_RATE_INFO(1, INV, INV, 2, INV, 2, INV, 2), /* 1mbps */
- IWL_DECLARE_RATE_INFO(2, INV, 1, 5, 1, 5, 1, 5), /* 2mbps */
- IWL_DECLARE_RATE_INFO(5, INV, 2, 6, 2, 11, 2, 11), /*5.5mbps */
- IWL_DECLARE_RATE_INFO(11, INV, 9, 12, 9, 12, 5, 18), /* 11mbps */
- IWL_DECLARE_RATE_INFO(6, 6, 5, 9, 5, 11, 5, 11), /* 6mbps */
- IWL_DECLARE_RATE_INFO(9, 6, 6, 11, 6, 11, 5, 11), /* 9mbps */
- IWL_DECLARE_RATE_INFO(12, 12, 11, 18, 11, 18, 11, 18), /* 12mbps */
- IWL_DECLARE_RATE_INFO(18, 18, 12, 24, 12, 24, 11, 24), /* 18mbps */
- IWL_DECLARE_RATE_INFO(24, 24, 18, 36, 18, 36, 18, 36), /* 24mbps */
- IWL_DECLARE_RATE_INFO(36, 36, 24, 48, 24, 48, 24, 48), /* 36mbps */
- IWL_DECLARE_RATE_INFO(48, 48, 36, 54, 36, 54, 36, 54), /* 48mbps */
- IWL_DECLARE_RATE_INFO(54, 54, 48, INV, 48, INV, 48, INV),/* 54mbps */
- IWL_DECLARE_RATE_INFO(60, 60, 48, INV, 48, INV, 48, INV),/* 60mbps */
+const struct il_rate_info iwlegacy_rates[IL_RATE_COUNT] = {
+ IL_DECLARE_RATE_INFO(1, INV, INV, 2, INV, 2, INV, 2), /* 1mbps */
+ IL_DECLARE_RATE_INFO(2, INV, 1, 5, 1, 5, 1, 5), /* 2mbps */
+ IL_DECLARE_RATE_INFO(5, INV, 2, 6, 2, 11, 2, 11), /*5.5mbps */
+ IL_DECLARE_RATE_INFO(11, INV, 9, 12, 9, 12, 5, 18), /* 11mbps */
+ IL_DECLARE_RATE_INFO(6, 6, 5, 9, 5, 11, 5, 11), /* 6mbps */
+ IL_DECLARE_RATE_INFO(9, 6, 6, 11, 6, 11, 5, 11), /* 9mbps */
+ IL_DECLARE_RATE_INFO(12, 12, 11, 18, 11, 18, 11, 18), /* 12mbps */
+ IL_DECLARE_RATE_INFO(18, 18, 12, 24, 12, 24, 11, 24), /* 18mbps */
+ IL_DECLARE_RATE_INFO(24, 24, 18, 36, 18, 36, 18, 36), /* 24mbps */
+ IL_DECLARE_RATE_INFO(36, 36, 24, 48, 24, 48, 24, 48), /* 36mbps */
+ IL_DECLARE_RATE_INFO(48, 48, 36, 54, 36, 54, 36, 54), /* 48mbps */
+ IL_DECLARE_RATE_INFO(54, 54, 48, INV, 48, INV, 48, INV),/* 54mbps */
+ IL_DECLARE_RATE_INFO(60, 60, 48, INV, 48, INV, 48, INV),/* 60mbps */
};
-static int iwl4965_hwrate_to_plcp_idx(u32 rate_n_flags)
+static int il4965_hwrate_to_plcp_idx(u32 rate_n_flags)
{
int idx = 0;
@@ -120,14 +120,14 @@
if (rate_n_flags & RATE_MCS_HT_MSK) {
idx = (rate_n_flags & 0xff);
- if (idx >= IWL_RATE_MIMO2_6M_PLCP)
- idx = idx - IWL_RATE_MIMO2_6M_PLCP;
+ if (idx >= IL_RATE_MIMO2_6M_PLCP)
+ idx = idx - IL_RATE_MIMO2_6M_PLCP;
- idx += IWL_FIRST_OFDM_RATE;
+ idx += IL_FIRST_OFDM_RATE;
/* skip 9M not supported in ht*/
- if (idx >= IWL_RATE_9M_INDEX)
+ if (idx >= IL_RATE_9M_INDEX)
idx += 1;
- if ((idx >= IWL_FIRST_OFDM_RATE) && (idx <= IWL_LAST_OFDM_RATE))
+ if ((idx >= IL_FIRST_OFDM_RATE) && (idx <= IL_LAST_OFDM_RATE))
return idx;
/* legacy rate format, search for match in table */
@@ -140,20 +140,20 @@
return -1;
}
-static void iwl4965_rs_rate_scale_perform(struct iwl_priv *priv,
+static void il4965_rs_rate_scale_perform(struct il_priv *priv,
struct sk_buff *skb,
struct ieee80211_sta *sta,
- struct iwl_lq_sta *lq_sta);
-static void iwl4965_rs_fill_link_cmd(struct iwl_priv *priv,
- struct iwl_lq_sta *lq_sta, u32 rate_n_flags);
-static void iwl4965_rs_stay_in_table(struct iwl_lq_sta *lq_sta,
+ struct il_lq_sta *lq_sta);
+static void il4965_rs_fill_link_cmd(struct il_priv *priv,
+ struct il_lq_sta *lq_sta, u32 rate_n_flags);
+static void il4965_rs_stay_in_table(struct il_lq_sta *lq_sta,
bool force_search);
#ifdef CONFIG_MAC80211_DEBUGFS
-static void iwl4965_rs_dbgfs_set_mcs(struct iwl_lq_sta *lq_sta,
+static void il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta,
u32 *rate_n_flags, int index);
#else
-static void iwl4965_rs_dbgfs_set_mcs(struct iwl_lq_sta *lq_sta,
+static void il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta,
u32 *rate_n_flags, int index)
{}
#endif
@@ -169,32 +169,32 @@
* (2.4 GHz) band.
*/
-static s32 expected_tpt_legacy[IWL_RATE_COUNT] = {
+static s32 expected_tpt_legacy[IL_RATE_COUNT] = {
7, 13, 35, 58, 40, 57, 72, 98, 121, 154, 177, 186, 0
};
-static s32 expected_tpt_siso20MHz[4][IWL_RATE_COUNT] = {
+static s32 expected_tpt_siso20MHz[4][IL_RATE_COUNT] = {
{0, 0, 0, 0, 42, 0, 76, 102, 124, 158, 183, 193, 202}, /* Norm */
{0, 0, 0, 0, 46, 0, 82, 110, 132, 167, 192, 202, 210}, /* SGI */
{0, 0, 0, 0, 48, 0, 93, 135, 176, 251, 319, 351, 381}, /* AGG */
{0, 0, 0, 0, 53, 0, 102, 149, 193, 275, 348, 381, 413}, /* AGG+SGI */
};
-static s32 expected_tpt_siso40MHz[4][IWL_RATE_COUNT] = {
+static s32 expected_tpt_siso40MHz[4][IL_RATE_COUNT] = {
{0, 0, 0, 0, 77, 0, 127, 160, 184, 220, 242, 250, 257}, /* Norm */
{0, 0, 0, 0, 83, 0, 135, 169, 193, 229, 250, 257, 264}, /* SGI */
{0, 0, 0, 0, 96, 0, 182, 259, 328, 451, 553, 598, 640}, /* AGG */
{0, 0, 0, 0, 106, 0, 199, 282, 357, 487, 593, 640, 683}, /* AGG+SGI */
};
-static s32 expected_tpt_mimo2_20MHz[4][IWL_RATE_COUNT] = {
+static s32 expected_tpt_mimo2_20MHz[4][IL_RATE_COUNT] = {
{0, 0, 0, 0, 74, 0, 123, 155, 179, 213, 235, 243, 250}, /* Norm */
{0, 0, 0, 0, 81, 0, 131, 164, 187, 221, 242, 250, 256}, /* SGI */
{0, 0, 0, 0, 92, 0, 175, 250, 317, 436, 534, 578, 619}, /* AGG */
{0, 0, 0, 0, 102, 0, 192, 273, 344, 470, 573, 619, 660}, /* AGG+SGI*/
};
-static s32 expected_tpt_mimo2_40MHz[4][IWL_RATE_COUNT] = {
+static s32 expected_tpt_mimo2_40MHz[4][IL_RATE_COUNT] = {
{0, 0, 0, 0, 123, 0, 182, 214, 235, 264, 279, 285, 289}, /* Norm */
{0, 0, 0, 0, 131, 0, 191, 222, 242, 270, 284, 289, 293}, /* SGI */
{0, 0, 0, 0, 180, 0, 327, 446, 545, 708, 828, 878, 922}, /* AGG */
@@ -202,7 +202,7 @@
};
/* mbps, mcs */
-static const struct iwl_rate_mcs_info iwl_rate_mcs[IWL_RATE_COUNT] = {
+static const struct il_rate_mcs_info il_rate_mcs[IL_RATE_COUNT] = {
{ "1", "BPSK DSSS"},
{ "2", "QPSK DSSS"},
{"5.5", "BPSK CCK"},
@@ -220,23 +220,23 @@
#define MCS_INDEX_PER_STREAM (8)
-static inline u8 iwl4965_rs_extract_rate(u32 rate_n_flags)
+static inline u8 il4965_rs_extract_rate(u32 rate_n_flags)
{
return (u8)(rate_n_flags & 0xFF);
}
static void
-iwl4965_rs_rate_scale_clear_window(struct iwl_rate_scale_data *window)
+il4965_rs_rate_scale_clear_window(struct il_rate_scale_data *window)
{
window->data = 0;
window->success_counter = 0;
- window->success_ratio = IWL_INVALID_VALUE;
+ window->success_ratio = IL_INVALID_VALUE;
window->counter = 0;
- window->average_tpt = IWL_INVALID_VALUE;
+ window->average_tpt = IL_INVALID_VALUE;
window->stamp = 0;
}
-static inline u8 iwl4965_rs_is_valid_ant(u8 valid_antenna, u8 ant_type)
+static inline u8 il4965_rs_is_valid_ant(u8 valid_antenna, u8 ant_type)
{
return (ant_type & valid_antenna) == ant_type;
}
@@ -246,7 +246,7 @@
* TID_MAX_TIME_DIFF, will be deleted.
*/
static void
-iwl4965_rs_tl_rm_old_stats(struct iwl_traffic_load *tl, u32 curr_time)
+il4965_rs_tl_rm_old_stats(struct il_traffic_load *tl, u32 curr_time)
{
/* The oldest age we want to keep */
u32 oldest_time = curr_time - TID_MAX_TIME_DIFF;
@@ -267,13 +267,13 @@
* increment traffic load value for tid and also remove
* any old values if passed the certain time period
*/
-static u8 iwl4965_rs_tl_add_packet(struct iwl_lq_sta *lq_data,
+static u8 il4965_rs_tl_add_packet(struct il_lq_sta *lq_data,
struct ieee80211_hdr *hdr)
{
u32 curr_time = jiffies_to_msecs(jiffies);
u32 time_diff;
s32 index;
- struct iwl_traffic_load *tl = NULL;
+ struct il_traffic_load *tl = NULL;
u8 tid;
if (ieee80211_is_data_qos(hdr->frame_control)) {
@@ -305,7 +305,7 @@
/* The history is too long: remove data that is older than */
/* TID_MAX_TIME_DIFF */
if (index >= TID_QUEUE_MAX_SIZE)
- iwl4965_rs_tl_rm_old_stats(tl, curr_time);
+ il4965_rs_tl_rm_old_stats(tl, curr_time);
index = (tl->head + index) % TID_QUEUE_MAX_SIZE;
tl->packet_count[index] = tl->packet_count[index] + 1;
@@ -320,12 +320,12 @@
/*
get the traffic load value for tid
*/
-static u32 iwl4965_rs_tl_get_load(struct iwl_lq_sta *lq_data, u8 tid)
+static u32 il4965_rs_tl_get_load(struct il_lq_sta *lq_data, u8 tid)
{
u32 curr_time = jiffies_to_msecs(jiffies);
u32 time_diff;
s32 index;
- struct iwl_traffic_load *tl = NULL;
+ struct il_traffic_load *tl = NULL;
if (tid >= TID_MAX_LOAD_COUNT)
return 0;
@@ -343,22 +343,22 @@
/* The history is too long: remove data that is older than */
/* TID_MAX_TIME_DIFF */
if (index >= TID_QUEUE_MAX_SIZE)
- iwl4965_rs_tl_rm_old_stats(tl, curr_time);
+ il4965_rs_tl_rm_old_stats(tl, curr_time);
return tl->total;
}
-static int iwl4965_rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
- struct iwl_lq_sta *lq_data, u8 tid,
+static int il4965_rs_tl_turn_on_agg_for_tid(struct il_priv *priv,
+ struct il_lq_sta *lq_data, u8 tid,
struct ieee80211_sta *sta)
{
int ret = -EAGAIN;
u32 load;
- load = iwl4965_rs_tl_get_load(lq_data, tid);
+ load = il4965_rs_tl_get_load(lq_data, tid);
- if (load > IWL_AGG_LOAD_THRESHOLD) {
- IWL_DEBUG_HT(priv, "Starting Tx agg: STA: %pM tid: %d\n",
+ if (load > IL_AGG_LOAD_THRESHOLD) {
+ IL_DEBUG_HT(priv, "Starting Tx agg: STA: %pM tid: %d\n",
sta->addr, tid);
ret = ieee80211_start_tx_ba_session(sta, tid, 5000);
if (ret == -EAGAIN) {
@@ -367,29 +367,29 @@
* this might be cause by reloading firmware
* stop the tx ba session here
*/
- IWL_ERR(priv, "Fail start Tx agg on tid: %d\n",
+ IL_ERR(priv, "Fail start Tx agg on tid: %d\n",
tid);
ieee80211_stop_tx_ba_session(sta, tid);
}
} else {
- IWL_ERR(priv, "Aggregation not enabled for tid %d "
+ IL_ERR(priv, "Aggregation not enabled for tid %d "
"because load = %u\n", tid, load);
}
return ret;
}
-static void iwl4965_rs_tl_turn_on_agg(struct iwl_priv *priv, u8 tid,
- struct iwl_lq_sta *lq_data,
+static void il4965_rs_tl_turn_on_agg(struct il_priv *priv, u8 tid,
+ struct il_lq_sta *lq_data,
struct ieee80211_sta *sta)
{
if (tid < TID_MAX_LOAD_COUNT)
- iwl4965_rs_tl_turn_on_agg_for_tid(priv, lq_data, tid, sta);
+ il4965_rs_tl_turn_on_agg_for_tid(priv, lq_data, tid, sta);
else
- IWL_ERR(priv, "tid exceeds max load count: %d/%d\n",
+ IL_ERR(priv, "tid exceeds max load count: %d/%d\n",
tid, TID_MAX_LOAD_COUNT);
}
-static inline int iwl4965_get_iwl4965_num_of_ant_from_rate(u32 rate_n_flags)
+static inline int il4965_get_il4965_num_of_ant_from_rate(u32 rate_n_flags)
{
return !!(rate_n_flags & RATE_MCS_ANT_A_MSK) +
!!(rate_n_flags & RATE_MCS_ANT_B_MSK) +
@@ -397,11 +397,11 @@
}
/*
- * Static function to get the expected throughput from an iwl_scale_tbl_info
+ * Static function to get the expected throughput from an il_scale_tbl_info
* that wraps a NULL pointer check
*/
static s32
-iwl4965_get_expected_tpt(struct iwl_scale_tbl_info *tbl, int rs_index)
+il4965_get_expected_tpt(struct il_scale_tbl_info *tbl, int rs_index)
{
if (tbl->expected_tpt)
return tbl->expected_tpt[rs_index];
@@ -409,27 +409,27 @@
}
/**
- * iwl4965_rs_collect_tx_data - Update the success/failure sliding window
+ * il4965_rs_collect_tx_data - Update the success/failure sliding window
*
* We keep a sliding window of the last 62 packets transmitted
* at this rate. window->data contains the bitmask of successful
* packets.
*/
-static int iwl4965_rs_collect_tx_data(struct iwl_scale_tbl_info *tbl,
+static int il4965_rs_collect_tx_data(struct il_scale_tbl_info *tbl,
int scale_index, int attempts, int successes)
{
- struct iwl_rate_scale_data *window = NULL;
- static const u64 mask = (((u64)1) << (IWL_RATE_MAX_WINDOW - 1));
+ struct il_rate_scale_data *window = NULL;
+ static const u64 mask = (((u64)1) << (IL_RATE_MAX_WINDOW - 1));
s32 fail_count, tpt;
- if (scale_index < 0 || scale_index >= IWL_RATE_COUNT)
+ if (scale_index < 0 || scale_index >= IL_RATE_COUNT)
return -EINVAL;
/* Select window for current tx bit rate */
window = &(tbl->win[scale_index]);
/* Get expected throughput */
- tpt = iwl4965_get_expected_tpt(tbl, scale_index);
+ tpt = il4965_get_expected_tpt(tbl, scale_index);
/*
* Keep track of only the latest 62 tx frame attempts in this rate's
@@ -440,10 +440,10 @@
* we keep these bitmaps!).
*/
while (attempts > 0) {
- if (window->counter >= IWL_RATE_MAX_WINDOW) {
+ if (window->counter >= IL_RATE_MAX_WINDOW) {
/* remove earliest */
- window->counter = IWL_RATE_MAX_WINDOW - 1;
+ window->counter = IL_RATE_MAX_WINDOW - 1;
if (window->data & mask) {
window->data &= ~mask;
@@ -472,16 +472,16 @@
window->success_ratio = 128 * (100 * window->success_counter)
/ window->counter;
else
- window->success_ratio = IWL_INVALID_VALUE;
+ window->success_ratio = IL_INVALID_VALUE;
fail_count = window->counter - window->success_counter;
/* Calculate average throughput, if we have enough history. */
- if ((fail_count >= IWL_RATE_MIN_FAILURE_TH) ||
- (window->success_counter >= IWL_RATE_MIN_SUCCESS_TH))
+ if ((fail_count >= IL_RATE_MIN_FAILURE_TH) ||
+ (window->success_counter >= IL_RATE_MIN_SUCCESS_TH))
window->average_tpt = (window->success_ratio * tpt + 64) / 128;
else
- window->average_tpt = IWL_INVALID_VALUE;
+ window->average_tpt = IL_INVALID_VALUE;
/* Tag this window as having been updated */
window->stamp = jiffies;
@@ -492,21 +492,21 @@
/*
* Fill uCode API rate_n_flags field, based on "search" or "active" table.
*/
-static u32 iwl4965_rate_n_flags_from_tbl(struct iwl_priv *priv,
- struct iwl_scale_tbl_info *tbl,
+static u32 il4965_rate_n_flags_from_tbl(struct il_priv *priv,
+ struct il_scale_tbl_info *tbl,
int index, u8 use_green)
{
u32 rate_n_flags = 0;
if (is_legacy(tbl->lq_type)) {
rate_n_flags = iwlegacy_rates[index].plcp;
- if (index >= IWL_FIRST_CCK_RATE && index <= IWL_LAST_CCK_RATE)
+ if (index >= IL_FIRST_CCK_RATE && index <= IL_LAST_CCK_RATE)
rate_n_flags |= RATE_MCS_CCK_MSK;
} else if (is_Ht(tbl->lq_type)) {
- if (index > IWL_LAST_OFDM_RATE) {
- IWL_ERR(priv, "Invalid HT rate index %d\n", index);
- index = IWL_LAST_OFDM_RATE;
+ if (index > IL_LAST_OFDM_RATE) {
+ IL_ERR(priv, "Invalid HT rate index %d\n", index);
+ index = IL_LAST_OFDM_RATE;
}
rate_n_flags = RATE_MCS_HT_MSK;
@@ -515,7 +515,7 @@
else
rate_n_flags |= iwlegacy_rates[index].plcp_mimo2;
} else {
- IWL_ERR(priv, "Invalid tbl->lq_type %d\n", tbl->lq_type);
+ IL_ERR(priv, "Invalid tbl->lq_type %d\n", tbl->lq_type);
}
rate_n_flags |= ((tbl->ant_type << RATE_MCS_ANT_POS) &
@@ -535,7 +535,7 @@
rate_n_flags |= RATE_MCS_GF_MSK;
if (is_siso(tbl->lq_type) && tbl->is_SGI) {
rate_n_flags &= ~RATE_MCS_SGI_MSK;
- IWL_ERR(priv, "GF was set with SGI:SISO\n");
+ IL_ERR(priv, "GF was set with SGI:SISO\n");
}
}
}
@@ -546,19 +546,19 @@
* Interpret uCode API's rate_n_flags format,
* fill "search" or "active" tx mode table.
*/
-static int iwl4965_rs_get_tbl_info_from_mcs(const u32 rate_n_flags,
+static int il4965_rs_get_tbl_info_from_mcs(const u32 rate_n_flags,
enum ieee80211_band band,
- struct iwl_scale_tbl_info *tbl,
+ struct il_scale_tbl_info *tbl,
int *rate_idx)
{
u32 ant_msk = (rate_n_flags & RATE_MCS_ANT_ABC_MSK);
- u8 iwl4965_num_of_ant = iwl4965_get_iwl4965_num_of_ant_from_rate(rate_n_flags);
+ u8 il4965_num_of_ant = il4965_get_il4965_num_of_ant_from_rate(rate_n_flags);
u8 mcs;
- memset(tbl, 0, sizeof(struct iwl_scale_tbl_info));
- *rate_idx = iwl4965_hwrate_to_plcp_idx(rate_n_flags);
+ memset(tbl, 0, sizeof(struct il_scale_tbl_info));
+ *rate_idx = il4965_hwrate_to_plcp_idx(rate_n_flags);
- if (*rate_idx == IWL_RATE_INVALID) {
+ if (*rate_idx == IL_RATE_INVALID) {
*rate_idx = -1;
return -EINVAL;
}
@@ -567,11 +567,11 @@
tbl->is_dup = 0;
tbl->ant_type = (ant_msk >> RATE_MCS_ANT_POS);
tbl->lq_type = LQ_NONE;
- tbl->max_search = IWL_MAX_SEARCH;
+ tbl->max_search = IL_MAX_SEARCH;
/* legacy rate format */
if (!(rate_n_flags & RATE_MCS_HT_MSK)) {
- if (iwl4965_num_of_ant == 1) {
+ if (il4965_num_of_ant == 1) {
if (band == IEEE80211_BAND_5GHZ)
tbl->lq_type = LQ_A;
else
@@ -589,15 +589,15 @@
if (rate_n_flags & RATE_MCS_DUP_MSK)
tbl->is_dup = 1;
- mcs = iwl4965_rs_extract_rate(rate_n_flags);
+ mcs = il4965_rs_extract_rate(rate_n_flags);
/* SISO */
- if (mcs <= IWL_RATE_SISO_60M_PLCP) {
- if (iwl4965_num_of_ant == 1)
+ if (mcs <= IL_RATE_SISO_60M_PLCP) {
+ if (il4965_num_of_ant == 1)
tbl->lq_type = LQ_SISO; /*else NONE*/
/* MIMO2 */
} else {
- if (iwl4965_num_of_ant == 2)
+ if (il4965_num_of_ant == 2)
tbl->lq_type = LQ_MIMO2;
}
}
@@ -606,21 +606,21 @@
/* switch to another antenna/antennas and return 1 */
/* if no other valid antenna found, return 0 */
-static int iwl4965_rs_toggle_antenna(u32 valid_ant, u32 *rate_n_flags,
- struct iwl_scale_tbl_info *tbl)
+static int il4965_rs_toggle_antenna(u32 valid_ant, u32 *rate_n_flags,
+ struct il_scale_tbl_info *tbl)
{
u8 new_ant_type;
if (!tbl->ant_type || tbl->ant_type > ANT_ABC)
return 0;
- if (!iwl4965_rs_is_valid_ant(valid_ant, tbl->ant_type))
+ if (!il4965_rs_is_valid_ant(valid_ant, tbl->ant_type))
return 0;
new_ant_type = ant_toggle_lookup[tbl->ant_type];
while ((new_ant_type != tbl->ant_type) &&
- !iwl4965_rs_is_valid_ant(valid_ant, new_ant_type))
+ !il4965_rs_is_valid_ant(valid_ant, new_ant_type))
new_ant_type = ant_toggle_lookup[new_ant_type];
if (new_ant_type == tbl->ant_type)
@@ -636,25 +636,25 @@
* Green-field mode is valid if the station supports it and
* there are no non-GF stations present in the BSS.
*/
-static bool iwl4965_rs_use_green(struct ieee80211_sta *sta)
+static bool il4965_rs_use_green(struct ieee80211_sta *sta)
{
- struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
- struct iwl_rxon_context *ctx = sta_priv->common.ctx;
+ struct il_station_priv *sta_priv = (void *)sta->drv_priv;
+ struct il_rxon_context *ctx = sta_priv->common.ctx;
return (sta->ht_cap.cap & IEEE80211_HT_CAP_GRN_FLD) &&
!(ctx->ht.non_gf_sta_present);
}
/**
- * iwl4965_rs_get_supported_rates - get the available rates
+ * il4965_rs_get_supported_rates - get the available rates
*
* if management frame or broadcast frame only return
* basic available rates.
*
*/
-static u16 iwl4965_rs_get_supported_rates(struct iwl_lq_sta *lq_sta,
+static u16 il4965_rs_get_supported_rates(struct il_lq_sta *lq_sta,
struct ieee80211_hdr *hdr,
- enum iwl_table_type rate_type)
+ enum il_table_type rate_type)
{
if (is_legacy(rate_type)) {
return lq_sta->active_legacy_rate;
@@ -667,11 +667,11 @@
}
static u16
-iwl4965_rs_get_adjacent_rate(struct iwl_priv *priv, u8 index, u16 rate_mask,
+il4965_rs_get_adjacent_rate(struct il_priv *priv, u8 index, u16 rate_mask,
int rate_type)
{
- u8 high = IWL_RATE_INVALID;
- u8 low = IWL_RATE_INVALID;
+ u8 high = IL_RATE_INVALID;
+ u8 low = IL_RATE_INVALID;
/* 802.11A or ht walks to the next literal adjacent rate in
* the rate table */
@@ -690,7 +690,7 @@
/* Find the next rate that is in the rate mask */
i = index + 1;
- for (mask = (1 << i); i < IWL_RATE_COUNT; i++, mask <<= 1) {
+ for (mask = (1 << i); i < IL_RATE_COUNT; i++, mask <<= 1) {
if (rate_mask & mask) {
high = i;
break;
@@ -701,30 +701,30 @@
}
low = index;
- while (low != IWL_RATE_INVALID) {
+ while (low != IL_RATE_INVALID) {
low = iwlegacy_rates[low].prev_rs;
- if (low == IWL_RATE_INVALID)
+ if (low == IL_RATE_INVALID)
break;
if (rate_mask & (1 << low))
break;
- IWL_DEBUG_RATE(priv, "Skipping masked lower rate: %d\n", low);
+ IL_DEBUG_RATE(priv, "Skipping masked lower rate: %d\n", low);
}
high = index;
- while (high != IWL_RATE_INVALID) {
+ while (high != IL_RATE_INVALID) {
high = iwlegacy_rates[high].next_rs;
- if (high == IWL_RATE_INVALID)
+ if (high == IL_RATE_INVALID)
break;
if (rate_mask & (1 << high))
break;
- IWL_DEBUG_RATE(priv, "Skipping masked higher rate: %d\n", high);
+ IL_DEBUG_RATE(priv, "Skipping masked higher rate: %d\n", high);
}
return (high << 8) | low;
}
-static u32 iwl4965_rs_get_lower_rate(struct iwl_lq_sta *lq_sta,
- struct iwl_scale_tbl_info *tbl,
+static u32 il4965_rs_get_lower_rate(struct il_lq_sta *lq_sta,
+ struct il_scale_tbl_info *tbl,
u8 scale_index, u8 ht_possible)
{
s32 low;
@@ -732,7 +732,7 @@
u16 high_low;
u8 switch_to_legacy = 0;
u8 is_green = lq_sta->is_green;
- struct iwl_priv *priv = lq_sta->drv;
+ struct il_priv *priv = lq_sta->drv;
/* check if we need to switch from HT to legacy rates.
* assumption is that mandatory rates (1Mbps or 6Mbps)
@@ -745,23 +745,23 @@
else
tbl->lq_type = LQ_G;
- if (iwl4965_num_of_ant(tbl->ant_type) > 1)
+ if (il4965_num_of_ant(tbl->ant_type) > 1)
tbl->ant_type =
- iwl4965_first_antenna(priv->hw_params.valid_tx_ant);
+ il4965_first_antenna(priv->hw_params.valid_tx_ant);
tbl->is_ht40 = 0;
tbl->is_SGI = 0;
- tbl->max_search = IWL_MAX_SEARCH;
+ tbl->max_search = IL_MAX_SEARCH;
}
- rate_mask = iwl4965_rs_get_supported_rates(lq_sta, NULL, tbl->lq_type);
+ rate_mask = il4965_rs_get_supported_rates(lq_sta, NULL, tbl->lq_type);
/* Mask with station rate restriction */
if (is_legacy(tbl->lq_type)) {
/* supp_rates has no CCK bits in A mode */
if (lq_sta->band == IEEE80211_BAND_5GHZ)
rate_mask = (u16)(rate_mask &
- (lq_sta->supp_rates << IWL_FIRST_OFDM_RATE));
+ (lq_sta->supp_rates << IL_FIRST_OFDM_RATE));
else
rate_mask = (u16)(rate_mask & lq_sta->supp_rates);
}
@@ -772,23 +772,23 @@
goto out;
}
- high_low = iwl4965_rs_get_adjacent_rate(lq_sta->drv,
+ high_low = il4965_rs_get_adjacent_rate(lq_sta->drv,
scale_index, rate_mask,
tbl->lq_type);
low = high_low & 0xff;
- if (low == IWL_RATE_INVALID)
+ if (low == IL_RATE_INVALID)
low = scale_index;
out:
- return iwl4965_rate_n_flags_from_tbl(lq_sta->drv, tbl, low, is_green);
+ return il4965_rate_n_flags_from_tbl(lq_sta->drv, tbl, low, is_green);
}
/*
* Simple function to compare two rate scale table types
*/
-static bool iwl4965_table_type_matches(struct iwl_scale_tbl_info *a,
- struct iwl_scale_tbl_info *b)
+static bool il4965_table_type_matches(struct il_scale_tbl_info *a,
+ struct il_scale_tbl_info *b)
{
return (a->lq_type == b->lq_type) && (a->ant_type == b->ant_type) &&
(a->is_SGI == b->is_SGI);
@@ -798,34 +798,34 @@
* mac80211 sends us Tx status
*/
static void
-iwl4965_rs_tx_status(void *priv_r, struct ieee80211_supported_band *sband,
+il4965_rs_tx_status(void *priv_r, struct ieee80211_supported_band *sband,
struct ieee80211_sta *sta, void *priv_sta,
struct sk_buff *skb)
{
int legacy_success;
int retries;
int rs_index, mac_index, i;
- struct iwl_lq_sta *lq_sta = priv_sta;
- struct iwl_link_quality_cmd *table;
+ struct il_lq_sta *lq_sta = priv_sta;
+ struct il_link_quality_cmd *table;
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
- struct iwl_priv *priv = (struct iwl_priv *)priv_r;
+ struct il_priv *priv = (struct il_priv *)priv_r;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
enum mac80211_rate_control_flags mac_flags;
u32 tx_rate;
- struct iwl_scale_tbl_info tbl_type;
- struct iwl_scale_tbl_info *curr_tbl, *other_tbl, *tmp_tbl;
- struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
- struct iwl_rxon_context *ctx = sta_priv->common.ctx;
+ struct il_scale_tbl_info tbl_type;
+ struct il_scale_tbl_info *curr_tbl, *other_tbl, *tmp_tbl;
+ struct il_station_priv *sta_priv = (void *)sta->drv_priv;
+ struct il_rxon_context *ctx = sta_priv->common.ctx;
- IWL_DEBUG_RATE_LIMIT(priv,
+ IL_DEBUG_RATE_LIMIT(priv,
"get frame ack response, update rate scale window\n");
/* Treat uninitialized rate scaling data same as non-existing. */
if (!lq_sta) {
- IWL_DEBUG_RATE(priv, "Station rate scaling not created yet.\n");
+ IL_DEBUG_RATE(priv, "Station rate scaling not created yet.\n");
return;
} else if (!lq_sta->drv) {
- IWL_DEBUG_RATE(priv, "Rate scaling not initialized yet.\n");
+ IL_DEBUG_RATE(priv, "Rate scaling not initialized yet.\n");
return;
}
@@ -848,23 +848,23 @@
*/
table = &lq_sta->lq;
tx_rate = le32_to_cpu(table->rs_table[0].rate_n_flags);
- iwl4965_rs_get_tbl_info_from_mcs(tx_rate,
+ il4965_rs_get_tbl_info_from_mcs(tx_rate,
priv->band, &tbl_type, &rs_index);
if (priv->band == IEEE80211_BAND_5GHZ)
- rs_index -= IWL_FIRST_OFDM_RATE;
+ rs_index -= IL_FIRST_OFDM_RATE;
mac_flags = info->status.rates[0].flags;
mac_index = info->status.rates[0].idx;
/* For HT packets, map MCS to PLCP */
if (mac_flags & IEEE80211_TX_RC_MCS) {
mac_index &= RATE_MCS_CODE_MSK; /* Remove # of streams */
- if (mac_index >= (IWL_RATE_9M_INDEX - IWL_FIRST_OFDM_RATE))
+ if (mac_index >= (IL_RATE_9M_INDEX - IL_FIRST_OFDM_RATE))
mac_index++;
/*
* mac80211 HT index is always zero-indexed; we need to move
* HT OFDM rates after CCK rates in 2.4 GHz band
*/
if (priv->band == IEEE80211_BAND_2GHZ)
- mac_index += IWL_FIRST_OFDM_RATE;
+ mac_index += IL_FIRST_OFDM_RATE;
}
/* Here we actually compare this rate to the latest LQ command */
if ((mac_index < 0) ||
@@ -880,18 +880,18 @@
(!!(tx_rate & RATE_MCS_GF_MSK) !=
!!(mac_flags & IEEE80211_TX_RC_GREEN_FIELD)) ||
(rs_index != mac_index)) {
- IWL_DEBUG_RATE(priv,
+ IL_DEBUG_RATE(priv,
"initial rate %d does not match %d (0x%x)\n",
mac_index, rs_index, tx_rate);
/*
* Since rates mis-match, the last LQ command may have failed.
- * After IWL_MISSED_RATE_MAX mis-matches, resync the uCode with
+ * After IL_MISSED_RATE_MAX mis-matches, resync the uCode with
* ... driver.
*/
lq_sta->missed_rate_counter++;
- if (lq_sta->missed_rate_counter > IWL_MISSED_RATE_MAX) {
+ if (lq_sta->missed_rate_counter > IL_MISSED_RATE_MAX) {
lq_sta->missed_rate_counter = 0;
- iwl_legacy_send_lq_cmd(priv, ctx, &lq_sta->lq,
+ il_send_lq_cmd(priv, ctx, &lq_sta->lq,
CMD_ASYNC, false);
}
/* Regardless, ignore this status info for outdated rate */
@@ -901,30 +901,30 @@
lq_sta->missed_rate_counter = 0;
/* Figure out if rate scale algorithm is in active or search table */
- if (iwl4965_table_type_matches(&tbl_type,
+ if (il4965_table_type_matches(&tbl_type,
&(lq_sta->lq_info[lq_sta->active_tbl]))) {
curr_tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
other_tbl = &(lq_sta->lq_info[1 - lq_sta->active_tbl]);
- } else if (iwl4965_table_type_matches(&tbl_type,
+ } else if (il4965_table_type_matches(&tbl_type,
&lq_sta->lq_info[1 - lq_sta->active_tbl])) {
curr_tbl = &(lq_sta->lq_info[1 - lq_sta->active_tbl]);
other_tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
} else {
- IWL_DEBUG_RATE(priv,
+ IL_DEBUG_RATE(priv,
"Neither active nor search matches tx rate\n");
tmp_tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
- IWL_DEBUG_RATE(priv, "active- lq:%x, ant:%x, SGI:%d\n",
+ IL_DEBUG_RATE(priv, "active- lq:%x, ant:%x, SGI:%d\n",
tmp_tbl->lq_type, tmp_tbl->ant_type, tmp_tbl->is_SGI);
tmp_tbl = &(lq_sta->lq_info[1 - lq_sta->active_tbl]);
- IWL_DEBUG_RATE(priv, "search- lq:%x, ant:%x, SGI:%d\n",
+ IL_DEBUG_RATE(priv, "search- lq:%x, ant:%x, SGI:%d\n",
tmp_tbl->lq_type, tmp_tbl->ant_type, tmp_tbl->is_SGI);
- IWL_DEBUG_RATE(priv, "actual- lq:%x, ant:%x, SGI:%d\n",
+ IL_DEBUG_RATE(priv, "actual- lq:%x, ant:%x, SGI:%d\n",
tbl_type.lq_type, tbl_type.ant_type, tbl_type.is_SGI);
/*
* no matching table found, let's by-pass the data collection
* and continue to perform rate scale to find the rate table
*/
- iwl4965_rs_stay_in_table(lq_sta, true);
+ il4965_rs_stay_in_table(lq_sta, true);
goto done;
}
@@ -937,9 +937,9 @@
*/
if (info->flags & IEEE80211_TX_STAT_AMPDU) {
tx_rate = le32_to_cpu(table->rs_table[0].rate_n_flags);
- iwl4965_rs_get_tbl_info_from_mcs(tx_rate, priv->band, &tbl_type,
+ il4965_rs_get_tbl_info_from_mcs(tx_rate, priv->band, &tbl_type,
&rs_index);
- iwl4965_rs_collect_tx_data(curr_tbl, rs_index,
+ il4965_rs_collect_tx_data(curr_tbl, rs_index,
info->status.ampdu_len,
info->status.ampdu_ack_len);
@@ -962,20 +962,20 @@
/* Collect data for each rate used during failed TX attempts */
for (i = 0; i <= retries; ++i) {
tx_rate = le32_to_cpu(table->rs_table[i].rate_n_flags);
- iwl4965_rs_get_tbl_info_from_mcs(tx_rate, priv->band,
+ il4965_rs_get_tbl_info_from_mcs(tx_rate, priv->band,
&tbl_type, &rs_index);
/*
* Only collect stats if retried rate is in the same RS
* table as active/search.
*/
- if (iwl4965_table_type_matches(&tbl_type, curr_tbl))
+ if (il4965_table_type_matches(&tbl_type, curr_tbl))
tmp_tbl = curr_tbl;
- else if (iwl4965_table_type_matches(&tbl_type,
+ else if (il4965_table_type_matches(&tbl_type,
other_tbl))
tmp_tbl = other_tbl;
else
continue;
- iwl4965_rs_collect_tx_data(tmp_tbl, rs_index, 1,
+ il4965_rs_collect_tx_data(tmp_tbl, rs_index, 1,
i < retries ? 0 : legacy_success);
}
@@ -990,7 +990,7 @@
done:
/* See if there's a better rate or modulation mode to try. */
if (sta && sta->supp_rates[sband->band])
- iwl4965_rs_rate_scale_perform(priv, skb, sta, lq_sta);
+ il4965_rs_rate_scale_perform(priv, skb, sta, lq_sta);
}
/*
@@ -1001,19 +1001,19 @@
* These control how long we stay using same modulation mode before
* searching for a new mode.
*/
-static void iwl4965_rs_set_stay_in_table(struct iwl_priv *priv, u8 is_legacy,
- struct iwl_lq_sta *lq_sta)
+static void il4965_rs_set_stay_in_table(struct il_priv *priv, u8 is_legacy,
+ struct il_lq_sta *lq_sta)
{
- IWL_DEBUG_RATE(priv, "we are staying in the same table\n");
+ IL_DEBUG_RATE(priv, "we are staying in the same table\n");
lq_sta->stay_in_tbl = 1; /* only place this gets set */
if (is_legacy) {
- lq_sta->table_count_limit = IWL_LEGACY_TABLE_COUNT;
- lq_sta->max_failure_limit = IWL_LEGACY_FAILURE_LIMIT;
- lq_sta->max_success_limit = IWL_LEGACY_SUCCESS_LIMIT;
+ lq_sta->table_count_limit = IL_LEGACY_TABLE_COUNT;
+ lq_sta->max_failure_limit = IL_LEGACY_FAILURE_LIMIT;
+ lq_sta->max_success_limit = IL_LEGACY_SUCCESS_LIMIT;
} else {
- lq_sta->table_count_limit = IWL_NONE_LEGACY_TABLE_COUNT;
- lq_sta->max_failure_limit = IWL_NONE_LEGACY_FAILURE_LIMIT;
- lq_sta->max_success_limit = IWL_NONE_LEGACY_SUCCESS_LIMIT;
+ lq_sta->table_count_limit = IL_NONE_LEGACY_TABLE_COUNT;
+ lq_sta->max_failure_limit = IL_NONE_LEGACY_FAILURE_LIMIT;
+ lq_sta->max_success_limit = IL_NONE_LEGACY_SUCCESS_LIMIT;
}
lq_sta->table_count = 0;
lq_sta->total_failed = 0;
@@ -1025,11 +1025,11 @@
/*
* Find correct throughput table for given mode of modulation
*/
-static void iwl4965_rs_set_expected_tpt_table(struct iwl_lq_sta *lq_sta,
- struct iwl_scale_tbl_info *tbl)
+static void il4965_rs_set_expected_tpt_table(struct il_lq_sta *lq_sta,
+ struct il_scale_tbl_info *tbl)
{
/* Used to choose among HT tables */
- s32 (*ht_tbl_pointer)[IWL_RATE_COUNT];
+ s32 (*ht_tbl_pointer)[IL_RATE_COUNT];
/* Check for invalid LQ type */
if (WARN_ON_ONCE(!is_legacy(tbl->lq_type) && !is_Ht(tbl->lq_type))) {
@@ -1077,13 +1077,13 @@
* 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 iwl4965_rs_get_best_rate(struct iwl_priv *priv,
- struct iwl_lq_sta *lq_sta,
- struct iwl_scale_tbl_info *tbl, /* "search" */
+static s32 il4965_rs_get_best_rate(struct il_priv *priv,
+ struct il_lq_sta *lq_sta,
+ struct il_scale_tbl_info *tbl, /* "search" */
u16 rate_mask, s8 index)
{
/* "active" values */
- struct iwl_scale_tbl_info *active_tbl =
+ struct il_scale_tbl_info *active_tbl =
&(lq_sta->lq_info[lq_sta->active_tbl]);
s32 active_sr = active_tbl->win[index].success_ratio;
s32 active_tpt = active_tbl->expected_tpt[index];
@@ -1095,10 +1095,10 @@
u16 high_low;
s8 rate = index;
- new_rate = high = low = start_hi = IWL_RATE_INVALID;
+ new_rate = high = low = start_hi = IL_RATE_INVALID;
for (; ;) {
- high_low = iwl4965_rs_get_adjacent_rate(priv, rate, rate_mask,
+ high_low = il4965_rs_get_adjacent_rate(priv, rate, rate_mask,
tbl->lq_type);
low = high_low & 0xff;
@@ -1120,16 +1120,16 @@
* "active" throughput (under perfect conditions).
*/
if ((((100 * tpt_tbl[rate]) > lq_sta->last_tpt) &&
- ((active_sr > IWL_RATE_DECREASE_TH) &&
- (active_sr <= IWL_RATE_HIGH_TH) &&
+ ((active_sr > IL_RATE_DECREASE_TH) &&
+ (active_sr <= IL_RATE_HIGH_TH) &&
(tpt_tbl[rate] <= active_tpt))) ||
- ((active_sr >= IWL_RATE_SCALE_SWITCH) &&
+ ((active_sr >= IL_RATE_SCALE_SWITCH) &&
(tpt_tbl[rate] > active_tpt))) {
/* (2nd or later pass)
* If we've already tried to raise the rate, and are
* now trying to lower it, use the higher rate. */
- if (start_hi != IWL_RATE_INVALID) {
+ if (start_hi != IL_RATE_INVALID) {
new_rate = start_hi;
break;
}
@@ -1137,7 +1137,7 @@
new_rate = rate;
/* Loop again with lower rate */
- if (low != IWL_RATE_INVALID)
+ if (low != IL_RATE_INVALID)
rate = low;
/* Lower rate not available, use the original */
@@ -1149,11 +1149,11 @@
/* (2nd or later pass)
* If we've already tried to lower the rate, and are
* now trying to raise it, use the lower rate. */
- if (new_rate != IWL_RATE_INVALID)
+ if (new_rate != IL_RATE_INVALID)
break;
/* Loop again with higher rate */
- else if (high != IWL_RATE_INVALID) {
+ else if (high != IL_RATE_INVALID) {
start_hi = high;
rate = high;
@@ -1171,17 +1171,17 @@
/*
* Set up search table for MIMO2
*/
-static int iwl4965_rs_switch_to_mimo2(struct iwl_priv *priv,
- struct iwl_lq_sta *lq_sta,
+static int il4965_rs_switch_to_mimo2(struct il_priv *priv,
+ struct il_lq_sta *lq_sta,
struct ieee80211_conf *conf,
struct ieee80211_sta *sta,
- struct iwl_scale_tbl_info *tbl, int index)
+ struct il_scale_tbl_info *tbl, int index)
{
u16 rate_mask;
s32 rate;
s8 is_green = lq_sta->is_green;
- struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
- struct iwl_rxon_context *ctx = sta_priv->common.ctx;
+ struct il_station_priv *sta_priv = (void *)sta->drv_priv;
+ struct il_rxon_context *ctx = sta_priv->common.ctx;
if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported)
return -1;
@@ -1194,35 +1194,35 @@
if (priv->hw_params.tx_chains_num < 2)
return -1;
- IWL_DEBUG_RATE(priv, "LQ: try to switch to MIMO2\n");
+ IL_DEBUG_RATE(priv, "LQ: try to switch to MIMO2\n");
tbl->lq_type = LQ_MIMO2;
tbl->is_dup = lq_sta->is_dup;
tbl->action = 0;
- tbl->max_search = IWL_MAX_SEARCH;
+ tbl->max_search = IL_MAX_SEARCH;
rate_mask = lq_sta->active_mimo2_rate;
- if (iwl_legacy_is_ht40_tx_allowed(priv, ctx, &sta->ht_cap))
+ if (il_is_ht40_tx_allowed(priv, ctx, &sta->ht_cap))
tbl->is_ht40 = 1;
else
tbl->is_ht40 = 0;
- iwl4965_rs_set_expected_tpt_table(lq_sta, tbl);
+ il4965_rs_set_expected_tpt_table(lq_sta, tbl);
- rate = iwl4965_rs_get_best_rate(priv, lq_sta, tbl, rate_mask, index);
+ rate = il4965_rs_get_best_rate(priv, lq_sta, tbl, rate_mask, index);
- IWL_DEBUG_RATE(priv, "LQ: MIMO2 best rate %d mask %X\n",
+ IL_DEBUG_RATE(priv, "LQ: MIMO2 best rate %d mask %X\n",
rate, rate_mask);
- if ((rate == IWL_RATE_INVALID) || !((1 << rate) & rate_mask)) {
- IWL_DEBUG_RATE(priv,
+ if ((rate == IL_RATE_INVALID) || !((1 << rate) & rate_mask)) {
+ IL_DEBUG_RATE(priv,
"Can't switch with index %d rate mask %x\n",
rate, rate_mask);
return -1;
}
- tbl->current_rate = iwl4965_rate_n_flags_from_tbl(priv,
+ tbl->current_rate = il4965_rate_n_flags_from_tbl(priv,
tbl, rate, is_green);
- IWL_DEBUG_RATE(priv, "LQ: Switch to new mcs %X index is green %X\n",
+ IL_DEBUG_RATE(priv, "LQ: Switch to new mcs %X index is green %X\n",
tbl->current_rate, is_green);
return 0;
}
@@ -1230,30 +1230,30 @@
/*
* Set up search table for SISO
*/
-static int iwl4965_rs_switch_to_siso(struct iwl_priv *priv,
- struct iwl_lq_sta *lq_sta,
+static int il4965_rs_switch_to_siso(struct il_priv *priv,
+ struct il_lq_sta *lq_sta,
struct ieee80211_conf *conf,
struct ieee80211_sta *sta,
- struct iwl_scale_tbl_info *tbl, int index)
+ struct il_scale_tbl_info *tbl, int index)
{
u16 rate_mask;
u8 is_green = lq_sta->is_green;
s32 rate;
- struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
- struct iwl_rxon_context *ctx = sta_priv->common.ctx;
+ struct il_station_priv *sta_priv = (void *)sta->drv_priv;
+ struct il_rxon_context *ctx = sta_priv->common.ctx;
if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported)
return -1;
- IWL_DEBUG_RATE(priv, "LQ: try to switch to SISO\n");
+ IL_DEBUG_RATE(priv, "LQ: try to switch to SISO\n");
tbl->is_dup = lq_sta->is_dup;
tbl->lq_type = LQ_SISO;
tbl->action = 0;
- tbl->max_search = IWL_MAX_SEARCH;
+ tbl->max_search = IL_MAX_SEARCH;
rate_mask = lq_sta->active_siso_rate;
- if (iwl_legacy_is_ht40_tx_allowed(priv, ctx, &sta->ht_cap))
+ if (il_is_ht40_tx_allowed(priv, ctx, &sta->ht_cap))
tbl->is_ht40 = 1;
else
tbl->is_ht40 = 0;
@@ -1261,19 +1261,19 @@
if (is_green)
tbl->is_SGI = 0; /*11n spec: no SGI in SISO+Greenfield*/
- iwl4965_rs_set_expected_tpt_table(lq_sta, tbl);
- rate = iwl4965_rs_get_best_rate(priv, lq_sta, tbl, rate_mask, index);
+ il4965_rs_set_expected_tpt_table(lq_sta, tbl);
+ rate = il4965_rs_get_best_rate(priv, lq_sta, tbl, rate_mask, index);
- IWL_DEBUG_RATE(priv, "LQ: get best rate %d mask %X\n", rate, rate_mask);
- if ((rate == IWL_RATE_INVALID) || !((1 << rate) & rate_mask)) {
- IWL_DEBUG_RATE(priv,
+ IL_DEBUG_RATE(priv, "LQ: get best rate %d mask %X\n", rate, rate_mask);
+ if ((rate == IL_RATE_INVALID) || !((1 << rate) & rate_mask)) {
+ IL_DEBUG_RATE(priv,
"can not switch with index %d rate mask %x\n",
rate, rate_mask);
return -1;
}
- tbl->current_rate = iwl4965_rate_n_flags_from_tbl(priv,
+ tbl->current_rate = il4965_rate_n_flags_from_tbl(priv,
tbl, rate, is_green);
- IWL_DEBUG_RATE(priv, "LQ: Switch to new mcs %X index is green %X\n",
+ IL_DEBUG_RATE(priv, "LQ: Switch to new mcs %X index is green %X\n",
tbl->current_rate, is_green);
return 0;
}
@@ -1281,62 +1281,62 @@
/*
* Try to switch to new modulation mode from legacy
*/
-static int iwl4965_rs_move_legacy_other(struct iwl_priv *priv,
- struct iwl_lq_sta *lq_sta,
+static int il4965_rs_move_legacy_other(struct il_priv *priv,
+ struct il_lq_sta *lq_sta,
struct ieee80211_conf *conf,
struct ieee80211_sta *sta,
int index)
{
- struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
- struct iwl_scale_tbl_info *search_tbl =
+ struct il_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
+ struct il_scale_tbl_info *search_tbl =
&(lq_sta->lq_info[(1 - lq_sta->active_tbl)]);
- struct iwl_rate_scale_data *window = &(tbl->win[index]);
- u32 sz = (sizeof(struct iwl_scale_tbl_info) -
- (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
+ struct il_rate_scale_data *window = &(tbl->win[index]);
+ u32 sz = (sizeof(struct il_scale_tbl_info) -
+ (sizeof(struct il_rate_scale_data) * IL_RATE_COUNT));
u8 start_action;
u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
u8 tx_chains_num = priv->hw_params.tx_chains_num;
int ret = 0;
u8 update_search_tbl_counter = 0;
- tbl->action = IWL_LEGACY_SWITCH_SISO;
+ tbl->action = IL_LEGACY_SWITCH_SISO;
start_action = tbl->action;
for (; ;) {
lq_sta->action_counter++;
switch (tbl->action) {
- case IWL_LEGACY_SWITCH_ANTENNA1:
- case IWL_LEGACY_SWITCH_ANTENNA2:
- IWL_DEBUG_RATE(priv, "LQ: Legacy toggle Antenna\n");
+ case IL_LEGACY_SWITCH_ANTENNA1:
+ case IL_LEGACY_SWITCH_ANTENNA2:
+ IL_DEBUG_RATE(priv, "LQ: Legacy toggle Antenna\n");
- if ((tbl->action == IWL_LEGACY_SWITCH_ANTENNA1 &&
+ if ((tbl->action == IL_LEGACY_SWITCH_ANTENNA1 &&
tx_chains_num <= 1) ||
- (tbl->action == IWL_LEGACY_SWITCH_ANTENNA2 &&
+ (tbl->action == IL_LEGACY_SWITCH_ANTENNA2 &&
tx_chains_num <= 2))
break;
/* Don't change antenna if success has been great */
- if (window->success_ratio >= IWL_RS_GOOD_RATIO)
+ if (window->success_ratio >= IL_RS_GOOD_RATIO)
break;
/* Set up search table to try other antenna */
memcpy(search_tbl, tbl, sz);
- if (iwl4965_rs_toggle_antenna(valid_tx_ant,
+ if (il4965_rs_toggle_antenna(valid_tx_ant,
&search_tbl->current_rate, search_tbl)) {
update_search_tbl_counter = 1;
- iwl4965_rs_set_expected_tpt_table(lq_sta,
+ il4965_rs_set_expected_tpt_table(lq_sta,
search_tbl);
goto out;
}
break;
- case IWL_LEGACY_SWITCH_SISO:
- IWL_DEBUG_RATE(priv, "LQ: Legacy switch to SISO\n");
+ case IL_LEGACY_SWITCH_SISO:
+ IL_DEBUG_RATE(priv, "LQ: Legacy switch to SISO\n");
/* Set up search table to try SISO */
memcpy(search_tbl, tbl, sz);
search_tbl->is_SGI = 0;
- ret = iwl4965_rs_switch_to_siso(priv, lq_sta, conf, sta,
+ ret = il4965_rs_switch_to_siso(priv, lq_sta, conf, sta,
search_tbl, index);
if (!ret) {
lq_sta->action_counter = 0;
@@ -1344,27 +1344,27 @@
}
break;
- case IWL_LEGACY_SWITCH_MIMO2_AB:
- case IWL_LEGACY_SWITCH_MIMO2_AC:
- case IWL_LEGACY_SWITCH_MIMO2_BC:
- IWL_DEBUG_RATE(priv, "LQ: Legacy switch to MIMO2\n");
+ case IL_LEGACY_SWITCH_MIMO2_AB:
+ case IL_LEGACY_SWITCH_MIMO2_AC:
+ case IL_LEGACY_SWITCH_MIMO2_BC:
+ IL_DEBUG_RATE(priv, "LQ: Legacy switch to MIMO2\n");
/* Set up search table to try MIMO */
memcpy(search_tbl, tbl, sz);
search_tbl->is_SGI = 0;
- if (tbl->action == IWL_LEGACY_SWITCH_MIMO2_AB)
+ if (tbl->action == IL_LEGACY_SWITCH_MIMO2_AB)
search_tbl->ant_type = ANT_AB;
- else if (tbl->action == IWL_LEGACY_SWITCH_MIMO2_AC)
+ else if (tbl->action == IL_LEGACY_SWITCH_MIMO2_AC)
search_tbl->ant_type = ANT_AC;
else
search_tbl->ant_type = ANT_BC;
- if (!iwl4965_rs_is_valid_ant(valid_tx_ant,
+ if (!il4965_rs_is_valid_ant(valid_tx_ant,
search_tbl->ant_type))
break;
- ret = iwl4965_rs_switch_to_mimo2(priv, lq_sta,
+ ret = il4965_rs_switch_to_mimo2(priv, lq_sta,
conf, sta,
search_tbl, index);
if (!ret) {
@@ -1374,8 +1374,8 @@
break;
}
tbl->action++;
- if (tbl->action > IWL_LEGACY_SWITCH_MIMO2_BC)
- tbl->action = IWL_LEGACY_SWITCH_ANTENNA1;
+ if (tbl->action > IL_LEGACY_SWITCH_MIMO2_BC)
+ tbl->action = IL_LEGACY_SWITCH_ANTENNA1;
if (tbl->action == start_action)
break;
@@ -1387,8 +1387,8 @@
out:
lq_sta->search_better_tbl = 1;
tbl->action++;
- if (tbl->action > IWL_LEGACY_SWITCH_MIMO2_BC)
- tbl->action = IWL_LEGACY_SWITCH_ANTENNA1;
+ if (tbl->action > IL_LEGACY_SWITCH_MIMO2_BC)
+ tbl->action = IL_LEGACY_SWITCH_ANTENNA1;
if (update_search_tbl_counter)
search_tbl->action = tbl->action;
return 0;
@@ -1398,19 +1398,19 @@
/*
* Try to switch to new modulation mode from SISO
*/
-static int iwl4965_rs_move_siso_to_other(struct iwl_priv *priv,
- struct iwl_lq_sta *lq_sta,
+static int il4965_rs_move_siso_to_other(struct il_priv *priv,
+ struct il_lq_sta *lq_sta,
struct ieee80211_conf *conf,
struct ieee80211_sta *sta, int index)
{
u8 is_green = lq_sta->is_green;
- struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
- struct iwl_scale_tbl_info *search_tbl =
+ struct il_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
+ struct il_scale_tbl_info *search_tbl =
&(lq_sta->lq_info[(1 - lq_sta->active_tbl)]);
- struct iwl_rate_scale_data *window = &(tbl->win[index]);
+ struct il_rate_scale_data *window = &(tbl->win[index]);
struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
- u32 sz = (sizeof(struct iwl_scale_tbl_info) -
- (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
+ u32 sz = (sizeof(struct il_scale_tbl_info) -
+ (sizeof(struct il_rate_scale_data) * IL_RATE_COUNT));
u8 start_action;
u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
u8 tx_chains_num = priv->hw_params.tx_chains_num;
@@ -1422,50 +1422,50 @@
for (;;) {
lq_sta->action_counter++;
switch (tbl->action) {
- case IWL_SISO_SWITCH_ANTENNA1:
- case IWL_SISO_SWITCH_ANTENNA2:
- IWL_DEBUG_RATE(priv, "LQ: SISO toggle Antenna\n");
- if ((tbl->action == IWL_SISO_SWITCH_ANTENNA1 &&
+ case IL_SISO_SWITCH_ANTENNA1:
+ case IL_SISO_SWITCH_ANTENNA2:
+ IL_DEBUG_RATE(priv, "LQ: SISO toggle Antenna\n");
+ if ((tbl->action == IL_SISO_SWITCH_ANTENNA1 &&
tx_chains_num <= 1) ||
- (tbl->action == IWL_SISO_SWITCH_ANTENNA2 &&
+ (tbl->action == IL_SISO_SWITCH_ANTENNA2 &&
tx_chains_num <= 2))
break;
- if (window->success_ratio >= IWL_RS_GOOD_RATIO)
+ if (window->success_ratio >= IL_RS_GOOD_RATIO)
break;
memcpy(search_tbl, tbl, sz);
- if (iwl4965_rs_toggle_antenna(valid_tx_ant,
+ if (il4965_rs_toggle_antenna(valid_tx_ant,
&search_tbl->current_rate, search_tbl)) {
update_search_tbl_counter = 1;
goto out;
}
break;
- case IWL_SISO_SWITCH_MIMO2_AB:
- case IWL_SISO_SWITCH_MIMO2_AC:
- case IWL_SISO_SWITCH_MIMO2_BC:
- IWL_DEBUG_RATE(priv, "LQ: SISO switch to MIMO2\n");
+ case IL_SISO_SWITCH_MIMO2_AB:
+ case IL_SISO_SWITCH_MIMO2_AC:
+ case IL_SISO_SWITCH_MIMO2_BC:
+ IL_DEBUG_RATE(priv, "LQ: SISO switch to MIMO2\n");
memcpy(search_tbl, tbl, sz);
search_tbl->is_SGI = 0;
- if (tbl->action == IWL_SISO_SWITCH_MIMO2_AB)
+ if (tbl->action == IL_SISO_SWITCH_MIMO2_AB)
search_tbl->ant_type = ANT_AB;
- else if (tbl->action == IWL_SISO_SWITCH_MIMO2_AC)
+ else if (tbl->action == IL_SISO_SWITCH_MIMO2_AC)
search_tbl->ant_type = ANT_AC;
else
search_tbl->ant_type = ANT_BC;
- if (!iwl4965_rs_is_valid_ant(valid_tx_ant,
+ if (!il4965_rs_is_valid_ant(valid_tx_ant,
search_tbl->ant_type))
break;
- ret = iwl4965_rs_switch_to_mimo2(priv, lq_sta,
+ ret = il4965_rs_switch_to_mimo2(priv, lq_sta,
conf, sta,
search_tbl, index);
if (!ret)
goto out;
break;
- case IWL_SISO_SWITCH_GI:
+ case IL_SISO_SWITCH_GI:
if (!tbl->is_ht40 && !(ht_cap->cap &
IEEE80211_HT_CAP_SGI_20))
break;
@@ -1473,32 +1473,32 @@
IEEE80211_HT_CAP_SGI_40))
break;
- IWL_DEBUG_RATE(priv, "LQ: SISO toggle SGI/NGI\n");
+ IL_DEBUG_RATE(priv, "LQ: SISO toggle SGI/NGI\n");
memcpy(search_tbl, tbl, sz);
if (is_green) {
if (!tbl->is_SGI)
break;
else
- IWL_ERR(priv,
+ IL_ERR(priv,
"SGI was set in GF+SISO\n");
}
search_tbl->is_SGI = !tbl->is_SGI;
- iwl4965_rs_set_expected_tpt_table(lq_sta, search_tbl);
+ il4965_rs_set_expected_tpt_table(lq_sta, search_tbl);
if (tbl->is_SGI) {
s32 tpt = lq_sta->last_tpt / 100;
if (tpt >= search_tbl->expected_tpt[index])
break;
}
search_tbl->current_rate =
- iwl4965_rate_n_flags_from_tbl(priv, search_tbl,
+ il4965_rate_n_flags_from_tbl(priv, search_tbl,
index, is_green);
update_search_tbl_counter = 1;
goto out;
}
tbl->action++;
- if (tbl->action > IWL_SISO_SWITCH_GI)
- tbl->action = IWL_SISO_SWITCH_ANTENNA1;
+ if (tbl->action > IL_SISO_SWITCH_GI)
+ tbl->action = IL_SISO_SWITCH_ANTENNA1;
if (tbl->action == start_action)
break;
@@ -1509,8 +1509,8 @@
out:
lq_sta->search_better_tbl = 1;
tbl->action++;
- if (tbl->action > IWL_SISO_SWITCH_GI)
- tbl->action = IWL_SISO_SWITCH_ANTENNA1;
+ if (tbl->action > IL_SISO_SWITCH_GI)
+ tbl->action = IL_SISO_SWITCH_ANTENNA1;
if (update_search_tbl_counter)
search_tbl->action = tbl->action;
@@ -1520,19 +1520,19 @@
/*
* Try to switch to new modulation mode from MIMO2
*/
-static int iwl4965_rs_move_mimo2_to_other(struct iwl_priv *priv,
- struct iwl_lq_sta *lq_sta,
+static int il4965_rs_move_mimo2_to_other(struct il_priv *priv,
+ struct il_lq_sta *lq_sta,
struct ieee80211_conf *conf,
struct ieee80211_sta *sta, int index)
{
s8 is_green = lq_sta->is_green;
- struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
- struct iwl_scale_tbl_info *search_tbl =
+ struct il_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
+ struct il_scale_tbl_info *search_tbl =
&(lq_sta->lq_info[(1 - lq_sta->active_tbl)]);
- struct iwl_rate_scale_data *window = &(tbl->win[index]);
+ struct il_rate_scale_data *window = &(tbl->win[index]);
struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
- u32 sz = (sizeof(struct iwl_scale_tbl_info) -
- (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
+ u32 sz = (sizeof(struct il_scale_tbl_info) -
+ (sizeof(struct il_rate_scale_data) * IL_RATE_COUNT));
u8 start_action;
u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
u8 tx_chains_num = priv->hw_params.tx_chains_num;
@@ -1543,43 +1543,43 @@
for (;;) {
lq_sta->action_counter++;
switch (tbl->action) {
- case IWL_MIMO2_SWITCH_ANTENNA1:
- case IWL_MIMO2_SWITCH_ANTENNA2:
- IWL_DEBUG_RATE(priv, "LQ: MIMO2 toggle Antennas\n");
+ case IL_MIMO2_SWITCH_ANTENNA1:
+ case IL_MIMO2_SWITCH_ANTENNA2:
+ IL_DEBUG_RATE(priv, "LQ: MIMO2 toggle Antennas\n");
if (tx_chains_num <= 2)
break;
- if (window->success_ratio >= IWL_RS_GOOD_RATIO)
+ if (window->success_ratio >= IL_RS_GOOD_RATIO)
break;
memcpy(search_tbl, tbl, sz);
- if (iwl4965_rs_toggle_antenna(valid_tx_ant,
+ if (il4965_rs_toggle_antenna(valid_tx_ant,
&search_tbl->current_rate, search_tbl)) {
update_search_tbl_counter = 1;
goto out;
}
break;
- case IWL_MIMO2_SWITCH_SISO_A:
- case IWL_MIMO2_SWITCH_SISO_B:
- case IWL_MIMO2_SWITCH_SISO_C:
- IWL_DEBUG_RATE(priv, "LQ: MIMO2 switch to SISO\n");
+ case IL_MIMO2_SWITCH_SISO_A:
+ case IL_MIMO2_SWITCH_SISO_B:
+ case IL_MIMO2_SWITCH_SISO_C:
+ IL_DEBUG_RATE(priv, "LQ: MIMO2 switch to SISO\n");
/* Set up new search table for SISO */
memcpy(search_tbl, tbl, sz);
- if (tbl->action == IWL_MIMO2_SWITCH_SISO_A)
+ if (tbl->action == IL_MIMO2_SWITCH_SISO_A)
search_tbl->ant_type = ANT_A;
- else if (tbl->action == IWL_MIMO2_SWITCH_SISO_B)
+ else if (tbl->action == IL_MIMO2_SWITCH_SISO_B)
search_tbl->ant_type = ANT_B;
else
search_tbl->ant_type = ANT_C;
- if (!iwl4965_rs_is_valid_ant(valid_tx_ant,
+ if (!il4965_rs_is_valid_ant(valid_tx_ant,
search_tbl->ant_type))
break;
- ret = iwl4965_rs_switch_to_siso(priv, lq_sta,
+ ret = il4965_rs_switch_to_siso(priv, lq_sta,
conf, sta,
search_tbl, index);
if (!ret)
@@ -1587,7 +1587,7 @@
break;
- case IWL_MIMO2_SWITCH_GI:
+ case IL_MIMO2_SWITCH_GI:
if (!tbl->is_ht40 && !(ht_cap->cap &
IEEE80211_HT_CAP_SGI_20))
break;
@@ -1595,12 +1595,12 @@
IEEE80211_HT_CAP_SGI_40))
break;
- IWL_DEBUG_RATE(priv, "LQ: MIMO2 toggle SGI/NGI\n");
+ IL_DEBUG_RATE(priv, "LQ: MIMO2 toggle SGI/NGI\n");
/* Set up new search table for MIMO2 */
memcpy(search_tbl, tbl, sz);
search_tbl->is_SGI = !tbl->is_SGI;
- iwl4965_rs_set_expected_tpt_table(lq_sta, search_tbl);
+ il4965_rs_set_expected_tpt_table(lq_sta, search_tbl);
/*
* If active table already uses the fastest possible
* modulation (dual stream with short guard interval),
@@ -1613,15 +1613,15 @@
break;
}
search_tbl->current_rate =
- iwl4965_rate_n_flags_from_tbl(priv, search_tbl,
+ il4965_rate_n_flags_from_tbl(priv, search_tbl,
index, is_green);
update_search_tbl_counter = 1;
goto out;
}
tbl->action++;
- if (tbl->action > IWL_MIMO2_SWITCH_GI)
- tbl->action = IWL_MIMO2_SWITCH_ANTENNA1;
+ if (tbl->action > IL_MIMO2_SWITCH_GI)
+ tbl->action = IL_MIMO2_SWITCH_ANTENNA1;
if (tbl->action == start_action)
break;
@@ -1631,8 +1631,8 @@
out:
lq_sta->search_better_tbl = 1;
tbl->action++;
- if (tbl->action > IWL_MIMO2_SWITCH_GI)
- tbl->action = IWL_MIMO2_SWITCH_ANTENNA1;
+ if (tbl->action > IL_MIMO2_SWITCH_GI)
+ tbl->action = IL_MIMO2_SWITCH_ANTENNA1;
if (update_search_tbl_counter)
search_tbl->action = tbl->action;
@@ -1648,13 +1648,13 @@
* 3) elapsed time in this mode (not used, for now)
*/
static void
-iwl4965_rs_stay_in_table(struct iwl_lq_sta *lq_sta, bool force_search)
+il4965_rs_stay_in_table(struct il_lq_sta *lq_sta, bool force_search)
{
- struct iwl_scale_tbl_info *tbl;
+ struct il_scale_tbl_info *tbl;
int i;
int active_tbl;
int flush_interval_passed = 0;
- struct iwl_priv *priv;
+ struct il_priv *priv;
priv = lq_sta->drv;
active_tbl = lq_sta->active_tbl;
@@ -1669,7 +1669,7 @@
flush_interval_passed =
time_after(jiffies,
(unsigned long)(lq_sta->flush_timer +
- IWL_RATE_SCALE_FLUSH_INTVL));
+ IL_RATE_SCALE_FLUSH_INTVL));
/*
* Check if we should allow search for new modulation mode.
@@ -1684,7 +1684,7 @@
(lq_sta->total_success > lq_sta->max_success_limit) ||
((!lq_sta->search_better_tbl) && (lq_sta->flush_timer)
&& (flush_interval_passed))) {
- IWL_DEBUG_RATE(priv, "LQ: stay is expired %d %d %d\n:",
+ IL_DEBUG_RATE(priv, "LQ: stay is expired %d %d %d\n:",
lq_sta->total_failed,
lq_sta->total_success,
flush_interval_passed);
@@ -1707,10 +1707,10 @@
lq_sta->table_count_limit) {
lq_sta->table_count = 0;
- IWL_DEBUG_RATE(priv,
+ IL_DEBUG_RATE(priv,
"LQ: stay in table clear win\n");
- for (i = 0; i < IWL_RATE_COUNT; i++)
- iwl4965_rs_rate_scale_clear_window(
+ for (i = 0; i < IL_RATE_COUNT; i++)
+ il4965_rs_rate_scale_clear_window(
&(tbl->win[i]));
}
}
@@ -1719,8 +1719,8 @@
* bitmaps and stats in active table (this will become the new
* "search" table). */
if (!lq_sta->stay_in_tbl) {
- for (i = 0; i < IWL_RATE_COUNT; i++)
- iwl4965_rs_rate_scale_clear_window(
+ for (i = 0; i < IL_RATE_COUNT; i++)
+ il4965_rs_rate_scale_clear_window(
&(tbl->win[i]));
}
}
@@ -1730,18 +1730,18 @@
* setup rate table in uCode
* return rate_n_flags as used in the table
*/
-static u32 iwl4965_rs_update_rate_tbl(struct iwl_priv *priv,
- struct iwl_rxon_context *ctx,
- struct iwl_lq_sta *lq_sta,
- struct iwl_scale_tbl_info *tbl,
+static u32 il4965_rs_update_rate_tbl(struct il_priv *priv,
+ struct il_rxon_context *ctx,
+ struct il_lq_sta *lq_sta,
+ struct il_scale_tbl_info *tbl,
int index, u8 is_green)
{
u32 rate;
/* Update uCode's rate table. */
- rate = iwl4965_rate_n_flags_from_tbl(priv, tbl, index, is_green);
- iwl4965_rs_fill_link_cmd(priv, lq_sta, rate);
- iwl_legacy_send_lq_cmd(priv, ctx, &lq_sta->lq, CMD_ASYNC, false);
+ rate = il4965_rate_n_flags_from_tbl(priv, tbl, index, is_green);
+ il4965_rs_fill_link_cmd(priv, lq_sta, rate);
+ il_send_lq_cmd(priv, ctx, &lq_sta->lq, CMD_ASYNC, false);
return rate;
}
@@ -1749,28 +1749,28 @@
/*
* Do rate scaling and search for new modulation mode.
*/
-static void iwl4965_rs_rate_scale_perform(struct iwl_priv *priv,
+static void il4965_rs_rate_scale_perform(struct il_priv *priv,
struct sk_buff *skb,
struct ieee80211_sta *sta,
- struct iwl_lq_sta *lq_sta)
+ struct il_lq_sta *lq_sta)
{
struct ieee80211_hw *hw = priv->hw;
struct ieee80211_conf *conf = &hw->conf;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
- int low = IWL_RATE_INVALID;
- int high = IWL_RATE_INVALID;
+ int low = IL_RATE_INVALID;
+ int high = IL_RATE_INVALID;
int index;
int i;
- struct iwl_rate_scale_data *window = NULL;
- int current_tpt = IWL_INVALID_VALUE;
- int low_tpt = IWL_INVALID_VALUE;
- int high_tpt = IWL_INVALID_VALUE;
+ struct il_rate_scale_data *window = NULL;
+ int current_tpt = IL_INVALID_VALUE;
+ int low_tpt = IL_INVALID_VALUE;
+ int high_tpt = IL_INVALID_VALUE;
u32 fail_count;
s8 scale_action = 0;
u16 rate_mask;
u8 update_lq = 0;
- struct iwl_scale_tbl_info *tbl, *tbl1;
+ struct il_scale_tbl_info *tbl, *tbl1;
u16 rate_scale_index_msk = 0;
u32 rate;
u8 is_green = 0;
@@ -1779,11 +1779,11 @@
u16 high_low;
s32 sr;
u8 tid = MAX_TID_COUNT;
- struct iwl_tid_data *tid_data;
- struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
- struct iwl_rxon_context *ctx = sta_priv->common.ctx;
+ struct il_tid_data *tid_data;
+ struct il_station_priv *sta_priv = (void *)sta->drv_priv;
+ struct il_rxon_context *ctx = sta_priv->common.ctx;
- IWL_DEBUG_RATE(priv, "rate scale calculate new rate for skb\n");
+ IL_DEBUG_RATE(priv, "rate scale calculate new rate for skb\n");
/* Send management frames and NO_ACK data using lowest rate. */
/* TODO: this could probably be improved.. */
@@ -1796,10 +1796,10 @@
lq_sta->supp_rates = sta->supp_rates[lq_sta->band];
- tid = iwl4965_rs_tl_add_packet(lq_sta, hdr);
+ tid = il4965_rs_tl_add_packet(lq_sta, hdr);
if ((tid != MAX_TID_COUNT) && (lq_sta->tx_agg_tid_en & (1 << tid))) {
tid_data = &priv->stations[lq_sta->lq.sta_id].tid[tid];
- if (tid_data->agg.state == IWL_AGG_OFF)
+ if (tid_data->agg.state == IL_AGG_OFF)
lq_sta->is_agg = 0;
else
lq_sta->is_agg = 1;
@@ -1820,26 +1820,26 @@
if (is_legacy(tbl->lq_type))
lq_sta->is_green = 0;
else
- lq_sta->is_green = iwl4965_rs_use_green(sta);
+ lq_sta->is_green = il4965_rs_use_green(sta);
is_green = lq_sta->is_green;
/* current tx rate */
index = lq_sta->last_txrate_idx;
- IWL_DEBUG_RATE(priv, "Rate scale index %d for type %d\n", index,
+ IL_DEBUG_RATE(priv, "Rate scale index %d for type %d\n", index,
tbl->lq_type);
/* rates available for this association, and for modulation mode */
- rate_mask = iwl4965_rs_get_supported_rates(lq_sta, hdr, tbl->lq_type);
+ rate_mask = il4965_rs_get_supported_rates(lq_sta, hdr, tbl->lq_type);
- IWL_DEBUG_RATE(priv, "mask 0x%04X\n", rate_mask);
+ IL_DEBUG_RATE(priv, "mask 0x%04X\n", rate_mask);
/* mask with station rate restriction */
if (is_legacy(tbl->lq_type)) {
if (lq_sta->band == IEEE80211_BAND_5GHZ)
/* supp_rates has no CCK bits in A mode */
rate_scale_index_msk = (u16) (rate_mask &
- (lq_sta->supp_rates << IWL_FIRST_OFDM_RATE));
+ (lq_sta->supp_rates << IL_FIRST_OFDM_RATE));
else
rate_scale_index_msk = (u16) (rate_mask &
lq_sta->supp_rates);
@@ -1851,15 +1851,15 @@
rate_scale_index_msk = rate_mask;
if (!((1 << index) & rate_scale_index_msk)) {
- IWL_ERR(priv, "Current Rate is not valid\n");
+ IL_ERR(priv, "Current Rate is not valid\n");
if (lq_sta->search_better_tbl) {
/* revert to active table if search table is not valid*/
tbl->lq_type = LQ_NONE;
lq_sta->search_better_tbl = 0;
tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
/* get "active" rate info */
- index = iwl4965_hwrate_to_plcp_idx(tbl->current_rate);
- rate = iwl4965_rs_update_rate_tbl(priv, ctx, lq_sta,
+ index = il4965_hwrate_to_plcp_idx(tbl->current_rate);
+ rate = il4965_rs_update_rate_tbl(priv, ctx, lq_sta,
tbl, index, is_green);
}
return;
@@ -1867,7 +1867,7 @@
/* Get expected throughput table and history window for current rate */
if (!tbl->expected_tpt) {
- IWL_ERR(priv, "tbl->expected_tpt is NULL\n");
+ IL_ERR(priv, "tbl->expected_tpt is NULL\n");
return;
}
@@ -1890,18 +1890,18 @@
* in current association (use new rate found above).
*/
fail_count = window->counter - window->success_counter;
- if ((fail_count < IWL_RATE_MIN_FAILURE_TH) &&
- (window->success_counter < IWL_RATE_MIN_SUCCESS_TH)) {
- IWL_DEBUG_RATE(priv, "LQ: still below TH. succ=%d total=%d "
+ if ((fail_count < IL_RATE_MIN_FAILURE_TH) &&
+ (window->success_counter < IL_RATE_MIN_SUCCESS_TH)) {
+ IL_DEBUG_RATE(priv, "LQ: still below TH. succ=%d total=%d "
"for index %d\n",
window->success_counter, window->counter, index);
/* Can't calculate this yet; not enough history */
- window->average_tpt = IWL_INVALID_VALUE;
+ window->average_tpt = IL_INVALID_VALUE;
/* Should we stay with this modulation mode,
* or search for a new one? */
- iwl4965_rs_stay_in_table(lq_sta, false);
+ il4965_rs_stay_in_table(lq_sta, false);
goto out;
}
@@ -1909,7 +1909,7 @@
* actual average throughput */
if (window->average_tpt != ((window->success_ratio *
tbl->expected_tpt[index] + 64) / 128)) {
- IWL_ERR(priv,
+ IL_ERR(priv,
"expected_tpt should have been calculated by now\n");
window->average_tpt = ((window->success_ratio *
tbl->expected_tpt[index] + 64) / 128);
@@ -1922,7 +1922,7 @@
* continuing to use the setup that we've been trying. */
if (window->average_tpt > lq_sta->last_tpt) {
- IWL_DEBUG_RATE(priv, "LQ: SWITCHING TO NEW TABLE "
+ IL_DEBUG_RATE(priv, "LQ: SWITCHING TO NEW TABLE "
"suc=%d cur-tpt=%d old-tpt=%d\n",
window->success_ratio,
window->average_tpt,
@@ -1938,7 +1938,7 @@
/* Else poor success; go back to mode in "active" table */
} else {
- IWL_DEBUG_RATE(priv, "LQ: GOING BACK TO THE OLD TABLE "
+ IL_DEBUG_RATE(priv, "LQ: GOING BACK TO THE OLD TABLE "
"suc=%d cur-tpt=%d old-tpt=%d\n",
window->success_ratio,
window->average_tpt,
@@ -1952,7 +1952,7 @@
tbl = &(lq_sta->lq_info[active_tbl]);
/* Revert to "active" rate and throughput info */
- index = iwl4965_hwrate_to_plcp_idx(tbl->current_rate);
+ index = il4965_hwrate_to_plcp_idx(tbl->current_rate);
current_tpt = lq_sta->last_tpt;
/* Need to set up a new rate table in uCode */
@@ -1968,7 +1968,7 @@
/* (Else) not in search of better modulation mode, try for better
* starting rate, while staying in this mode. */
- high_low = iwl4965_rs_get_adjacent_rate(priv, index,
+ high_low = il4965_rs_get_adjacent_rate(priv, index,
rate_scale_index_msk,
tbl->lq_type);
low = high_low & 0xff;
@@ -1977,39 +1977,39 @@
/* If user set max rate, dont allow higher than user constrain */
if ((lq_sta->max_rate_idx != -1) &&
(lq_sta->max_rate_idx < high))
- high = IWL_RATE_INVALID;
+ high = IL_RATE_INVALID;
sr = window->success_ratio;
/* Collect measured throughputs for current and adjacent rates */
current_tpt = window->average_tpt;
- if (low != IWL_RATE_INVALID)
+ if (low != IL_RATE_INVALID)
low_tpt = tbl->win[low].average_tpt;
- if (high != IWL_RATE_INVALID)
+ if (high != IL_RATE_INVALID)
high_tpt = tbl->win[high].average_tpt;
scale_action = 0;
/* Too many failures, decrease rate */
- if ((sr <= IWL_RATE_DECREASE_TH) || (current_tpt == 0)) {
- IWL_DEBUG_RATE(priv,
+ if ((sr <= IL_RATE_DECREASE_TH) || (current_tpt == 0)) {
+ IL_DEBUG_RATE(priv,
"decrease rate because of low success_ratio\n");
scale_action = -1;
/* No throughput measured yet for adjacent rates; try increase. */
- } else if ((low_tpt == IWL_INVALID_VALUE) &&
- (high_tpt == IWL_INVALID_VALUE)) {
+ } else if ((low_tpt == IL_INVALID_VALUE) &&
+ (high_tpt == IL_INVALID_VALUE)) {
- if (high != IWL_RATE_INVALID && sr >= IWL_RATE_INCREASE_TH)
+ if (high != IL_RATE_INVALID && sr >= IL_RATE_INCREASE_TH)
scale_action = 1;
- else if (low != IWL_RATE_INVALID)
+ else if (low != IL_RATE_INVALID)
scale_action = 0;
}
/* Both adjacent throughputs are measured, but neither one has better
* throughput; we're using the best rate, don't change it! */
- else if ((low_tpt != IWL_INVALID_VALUE) &&
- (high_tpt != IWL_INVALID_VALUE) &&
+ else if ((low_tpt != IL_INVALID_VALUE) &&
+ (high_tpt != IL_INVALID_VALUE) &&
(low_tpt < current_tpt) &&
(high_tpt < current_tpt))
scale_action = 0;
@@ -2018,23 +2018,23 @@
* and may have better performance. */
else {
/* Higher adjacent rate's throughput is measured */
- if (high_tpt != IWL_INVALID_VALUE) {
+ if (high_tpt != IL_INVALID_VALUE) {
/* Higher rate has better throughput */
if (high_tpt > current_tpt &&
- sr >= IWL_RATE_INCREASE_TH) {
+ sr >= IL_RATE_INCREASE_TH) {
scale_action = 1;
} else {
scale_action = 0;
}
/* Lower adjacent rate's throughput is measured */
- } else if (low_tpt != IWL_INVALID_VALUE) {
+ } else if (low_tpt != IL_INVALID_VALUE) {
/* Lower rate has better throughput */
if (low_tpt > current_tpt) {
- IWL_DEBUG_RATE(priv,
+ IL_DEBUG_RATE(priv,
"decrease rate because of low tpt\n");
scale_action = -1;
- } else if (sr >= IWL_RATE_INCREASE_TH) {
+ } else if (sr >= IL_RATE_INCREASE_TH) {
scale_action = 1;
}
}
@@ -2042,15 +2042,15 @@
/* Sanity check; asked for decrease, but success rate or throughput
* has been good at old rate. Don't change it. */
- if ((scale_action == -1) && (low != IWL_RATE_INVALID) &&
- ((sr > IWL_RATE_HIGH_TH) ||
+ if ((scale_action == -1) && (low != IL_RATE_INVALID) &&
+ ((sr > IL_RATE_HIGH_TH) ||
(current_tpt > (100 * tbl->expected_tpt[low]))))
scale_action = 0;
switch (scale_action) {
case -1:
/* Decrease starting rate, update uCode's rate table */
- if (low != IWL_RATE_INVALID) {
+ if (low != IL_RATE_INVALID) {
update_lq = 1;
index = low;
}
@@ -2058,7 +2058,7 @@
break;
case 1:
/* Increase starting rate, update uCode's rate table */
- if (high != IWL_RATE_INVALID) {
+ if (high != IL_RATE_INVALID) {
update_lq = 1;
index = high;
}
@@ -2070,19 +2070,19 @@
break;
}
- IWL_DEBUG_RATE(priv, "choose rate scale index %d action %d low %d "
+ IL_DEBUG_RATE(priv, "choose rate scale index %d action %d low %d "
"high %d type %d\n",
index, scale_action, low, high, tbl->lq_type);
lq_update:
/* Replace uCode's rate table for the destination station. */
if (update_lq)
- rate = iwl4965_rs_update_rate_tbl(priv, ctx, lq_sta,
+ rate = il4965_rs_update_rate_tbl(priv, ctx, lq_sta,
tbl, index, is_green);
/* Should we stay with this modulation mode,
* or search for a new one? */
- iwl4965_rs_stay_in_table(lq_sta, false);
+ il4965_rs_stay_in_table(lq_sta, false);
/*
* Search for new modulation mode if we're:
@@ -2098,32 +2098,32 @@
/* Select a new "search" modulation mode to try.
* If one is found, set up the new "search" table. */
if (is_legacy(tbl->lq_type))
- iwl4965_rs_move_legacy_other(priv, lq_sta,
+ il4965_rs_move_legacy_other(priv, lq_sta,
conf, sta, index);
else if (is_siso(tbl->lq_type))
- iwl4965_rs_move_siso_to_other(priv, lq_sta,
+ il4965_rs_move_siso_to_other(priv, lq_sta,
conf, sta, index);
else /* (is_mimo2(tbl->lq_type)) */
- iwl4965_rs_move_mimo2_to_other(priv, lq_sta,
+ il4965_rs_move_mimo2_to_other(priv, lq_sta,
conf, sta, index);
/* If new "search" mode was selected, set up in uCode table */
if (lq_sta->search_better_tbl) {
/* Access the "search" table, clear its history. */
tbl = &(lq_sta->lq_info[(1 - lq_sta->active_tbl)]);
- for (i = 0; i < IWL_RATE_COUNT; i++)
- iwl4965_rs_rate_scale_clear_window(
+ for (i = 0; i < IL_RATE_COUNT; i++)
+ il4965_rs_rate_scale_clear_window(
&(tbl->win[i]));
/* Use new "search" start rate */
- index = iwl4965_hwrate_to_plcp_idx(tbl->current_rate);
+ index = il4965_hwrate_to_plcp_idx(tbl->current_rate);
- IWL_DEBUG_RATE(priv,
+ IL_DEBUG_RATE(priv,
"Switch current mcs: %X index: %d\n",
tbl->current_rate, index);
- iwl4965_rs_fill_link_cmd(priv, lq_sta,
+ il4965_rs_fill_link_cmd(priv, lq_sta,
tbl->current_rate);
- iwl_legacy_send_lq_cmd(priv, ctx,
+ il_send_lq_cmd(priv, ctx,
&lq_sta->lq, CMD_ASYNC, false);
} else
done_search = 1;
@@ -2138,8 +2138,8 @@
tbl1 = &(lq_sta->lq_info[lq_sta->active_tbl]);
if (is_legacy(tbl1->lq_type) && !conf_is_ht(conf) &&
lq_sta->action_counter > tbl1->max_search) {
- IWL_DEBUG_RATE(priv, "LQ: STAY in legacy table\n");
- iwl4965_rs_set_stay_in_table(priv, 1, lq_sta);
+ IL_DEBUG_RATE(priv, "LQ: STAY in legacy table\n");
+ il4965_rs_set_stay_in_table(priv, 1, lq_sta);
}
/* If we're in an HT mode, and all 3 mode switch actions
@@ -2147,32 +2147,32 @@
* mode for a while before next round of mode comparisons. */
if (lq_sta->enable_counter &&
(lq_sta->action_counter >= tbl1->max_search)) {
- if ((lq_sta->last_tpt > IWL_AGG_TPT_THREHOLD) &&
+ if ((lq_sta->last_tpt > IL_AGG_TPT_THREHOLD) &&
(lq_sta->tx_agg_tid_en & (1 << tid)) &&
(tid != MAX_TID_COUNT)) {
tid_data =
&priv->stations[lq_sta->lq.sta_id].tid[tid];
- if (tid_data->agg.state == IWL_AGG_OFF) {
- IWL_DEBUG_RATE(priv,
+ if (tid_data->agg.state == IL_AGG_OFF) {
+ IL_DEBUG_RATE(priv,
"try to aggregate tid %d\n",
tid);
- iwl4965_rs_tl_turn_on_agg(priv, tid,
+ il4965_rs_tl_turn_on_agg(priv, tid,
lq_sta, sta);
}
}
- iwl4965_rs_set_stay_in_table(priv, 0, lq_sta);
+ il4965_rs_set_stay_in_table(priv, 0, lq_sta);
}
}
out:
- tbl->current_rate = iwl4965_rate_n_flags_from_tbl(priv, tbl,
+ tbl->current_rate = il4965_rate_n_flags_from_tbl(priv, tbl,
index, is_green);
i = index;
lq_sta->last_txrate_idx = i;
}
/**
- * iwl4965_rs_initialize_lq - Initialize a station's hardware rate table
+ * il4965_rs_initialize_lq - Initialize a station's hardware rate table
*
* The uCode's station table contains a table of fallback rates
* for automatic fallback during transmission.
@@ -2185,20 +2185,20 @@
* calling this function (which runs REPLY_TX_LINK_QUALITY_CMD,
* which requires station table entry to exist).
*/
-static void iwl4965_rs_initialize_lq(struct iwl_priv *priv,
+static void il4965_rs_initialize_lq(struct il_priv *priv,
struct ieee80211_conf *conf,
struct ieee80211_sta *sta,
- struct iwl_lq_sta *lq_sta)
+ struct il_lq_sta *lq_sta)
{
- struct iwl_scale_tbl_info *tbl;
+ struct il_scale_tbl_info *tbl;
int rate_idx;
int i;
u32 rate;
- u8 use_green = iwl4965_rs_use_green(sta);
+ u8 use_green = il4965_rs_use_green(sta);
u8 active_tbl = 0;
u8 valid_tx_ant;
- struct iwl_station_priv *sta_priv;
- struct iwl_rxon_context *ctx;
+ struct il_station_priv *sta_priv;
+ struct il_rxon_context *ctx;
if (!sta || !lq_sta)
return;
@@ -2217,56 +2217,56 @@
tbl = &(lq_sta->lq_info[active_tbl]);
- if ((i < 0) || (i >= IWL_RATE_COUNT))
+ if ((i < 0) || (i >= IL_RATE_COUNT))
i = 0;
rate = iwlegacy_rates[i].plcp;
- tbl->ant_type = iwl4965_first_antenna(valid_tx_ant);
+ tbl->ant_type = il4965_first_antenna(valid_tx_ant);
rate |= tbl->ant_type << RATE_MCS_ANT_POS;
- if (i >= IWL_FIRST_CCK_RATE && i <= IWL_LAST_CCK_RATE)
+ if (i >= IL_FIRST_CCK_RATE && i <= IL_LAST_CCK_RATE)
rate |= RATE_MCS_CCK_MSK;
- iwl4965_rs_get_tbl_info_from_mcs(rate, priv->band, tbl, &rate_idx);
- if (!iwl4965_rs_is_valid_ant(valid_tx_ant, tbl->ant_type))
- iwl4965_rs_toggle_antenna(valid_tx_ant, &rate, tbl);
+ il4965_rs_get_tbl_info_from_mcs(rate, priv->band, tbl, &rate_idx);
+ if (!il4965_rs_is_valid_ant(valid_tx_ant, tbl->ant_type))
+ il4965_rs_toggle_antenna(valid_tx_ant, &rate, tbl);
- rate = iwl4965_rate_n_flags_from_tbl(priv, tbl, rate_idx, use_green);
+ rate = il4965_rate_n_flags_from_tbl(priv, tbl, rate_idx, use_green);
tbl->current_rate = rate;
- iwl4965_rs_set_expected_tpt_table(lq_sta, tbl);
- iwl4965_rs_fill_link_cmd(NULL, lq_sta, rate);
+ il4965_rs_set_expected_tpt_table(lq_sta, tbl);
+ il4965_rs_fill_link_cmd(NULL, lq_sta, rate);
priv->stations[lq_sta->lq.sta_id].lq = &lq_sta->lq;
- iwl_legacy_send_lq_cmd(priv, ctx, &lq_sta->lq, CMD_SYNC, true);
+ il_send_lq_cmd(priv, ctx, &lq_sta->lq, CMD_SYNC, true);
}
static void
-iwl4965_rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta,
+il4965_rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta,
struct ieee80211_tx_rate_control *txrc)
{
struct sk_buff *skb = txrc->skb;
struct ieee80211_supported_band *sband = txrc->sband;
- struct iwl_priv *priv __maybe_unused = (struct iwl_priv *)priv_r;
+ struct il_priv *priv __maybe_unused = (struct il_priv *)priv_r;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- struct iwl_lq_sta *lq_sta = priv_sta;
+ struct il_lq_sta *lq_sta = priv_sta;
int rate_idx;
- IWL_DEBUG_RATE_LIMIT(priv, "rate scale calculate new rate for skb\n");
+ IL_DEBUG_RATE_LIMIT(priv, "rate scale calculate new rate for skb\n");
/* Get max rate if user set max rate */
if (lq_sta) {
lq_sta->max_rate_idx = txrc->max_rate_idx;
if ((sband->band == IEEE80211_BAND_5GHZ) &&
(lq_sta->max_rate_idx != -1))
- lq_sta->max_rate_idx += IWL_FIRST_OFDM_RATE;
+ lq_sta->max_rate_idx += IL_FIRST_OFDM_RATE;
if ((lq_sta->max_rate_idx < 0) ||
- (lq_sta->max_rate_idx >= IWL_RATE_COUNT))
+ (lq_sta->max_rate_idx >= IL_RATE_COUNT))
lq_sta->max_rate_idx = -1;
}
/* Treat uninitialized rate scaling data same as non-existing. */
if (lq_sta && !lq_sta->drv) {
- IWL_DEBUG_RATE(priv, "Rate scaling not initialized yet.\n");
+ IL_DEBUG_RATE(priv, "Rate scaling not initialized yet.\n");
priv_sta = NULL;
}
@@ -2280,11 +2280,11 @@
rate_idx = lq_sta->last_txrate_idx;
if (lq_sta->last_rate_n_flags & RATE_MCS_HT_MSK) {
- rate_idx -= IWL_FIRST_OFDM_RATE;
+ rate_idx -= IL_FIRST_OFDM_RATE;
/* 6M and 9M shared same MCS index */
rate_idx = (rate_idx > 0) ? (rate_idx - 1) : 0;
- if (iwl4965_rs_extract_rate(lq_sta->last_rate_n_flags) >=
- IWL_RATE_MIMO2_6M_PLCP)
+ if (il4965_rs_extract_rate(lq_sta->last_rate_n_flags) >=
+ IL_RATE_MIMO2_6M_PLCP)
rate_idx = rate_idx + MCS_INDEX_PER_STREAM;
info->control.rates[0].flags = IEEE80211_TX_RC_MCS;
if (lq_sta->last_rate_n_flags & RATE_MCS_SGI_MSK)
@@ -2301,29 +2301,29 @@
IEEE80211_TX_RC_GREEN_FIELD;
} else {
/* Check for invalid rates */
- if ((rate_idx < 0) || (rate_idx >= IWL_RATE_COUNT_LEGACY) ||
+ if ((rate_idx < 0) || (rate_idx >= IL_RATE_COUNT_LEGACY) ||
((sband->band == IEEE80211_BAND_5GHZ) &&
- (rate_idx < IWL_FIRST_OFDM_RATE)))
+ (rate_idx < IL_FIRST_OFDM_RATE)))
rate_idx = rate_lowest_index(sband, sta);
/* On valid 5 GHz rate, adjust index */
else if (sband->band == IEEE80211_BAND_5GHZ)
- rate_idx -= IWL_FIRST_OFDM_RATE;
+ rate_idx -= IL_FIRST_OFDM_RATE;
info->control.rates[0].flags = 0;
}
info->control.rates[0].idx = rate_idx;
}
-static void *iwl4965_rs_alloc_sta(void *priv_rate, struct ieee80211_sta *sta,
+static void *il4965_rs_alloc_sta(void *priv_rate, struct ieee80211_sta *sta,
gfp_t gfp)
{
- struct iwl_lq_sta *lq_sta;
- struct iwl_station_priv *sta_priv =
- (struct iwl_station_priv *) sta->drv_priv;
- struct iwl_priv *priv;
+ struct il_lq_sta *lq_sta;
+ struct il_station_priv *sta_priv =
+ (struct il_station_priv *) sta->drv_priv;
+ struct il_priv *priv;
- priv = (struct iwl_priv *)priv_rate;
- IWL_DEBUG_RATE(priv, "create station rate scale window\n");
+ priv = (struct il_priv *)priv_rate;
+ IL_DEBUG_RATE(priv, "create station rate scale window\n");
lq_sta = &sta_priv->lq_sta;
@@ -2334,7 +2334,7 @@
* Called after adding a new station to initialize rate scaling
*/
void
-iwl4965_rs_rate_init(struct iwl_priv *priv,
+il4965_rs_rate_init(struct il_priv *priv,
struct ieee80211_sta *sta,
u8 sta_id)
{
@@ -2342,11 +2342,11 @@
struct ieee80211_hw *hw = priv->hw;
struct ieee80211_conf *conf = &priv->hw->conf;
struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
- struct iwl_station_priv *sta_priv;
- struct iwl_lq_sta *lq_sta;
+ struct il_station_priv *sta_priv;
+ struct il_lq_sta *lq_sta;
struct ieee80211_supported_band *sband;
- sta_priv = (struct iwl_station_priv *) sta->drv_priv;
+ sta_priv = (struct il_station_priv *) sta->drv_priv;
lq_sta = &sta_priv->lq_sta;
sband = hw->wiphy->bands[conf->channel->band];
@@ -2354,18 +2354,18 @@
lq_sta->lq.sta_id = sta_id;
for (j = 0; j < LQ_SIZE; j++)
- for (i = 0; i < IWL_RATE_COUNT; i++)
- iwl4965_rs_rate_scale_clear_window(
+ for (i = 0; i < IL_RATE_COUNT; i++)
+ il4965_rs_rate_scale_clear_window(
&lq_sta->lq_info[j].win[i]);
lq_sta->flush_timer = 0;
lq_sta->supp_rates = sta->supp_rates[sband->band];
for (j = 0; j < LQ_SIZE; j++)
- for (i = 0; i < IWL_RATE_COUNT; i++)
- iwl4965_rs_rate_scale_clear_window(
+ for (i = 0; i < IL_RATE_COUNT; i++)
+ il4965_rs_rate_scale_clear_window(
&lq_sta->lq_info[j].win[i]);
- IWL_DEBUG_RATE(priv, "LQ:"
+ IL_DEBUG_RATE(priv, "LQ:"
"*** rate scale station global init for station %d ***\n",
sta_id);
/* TODO: what is a good starting rate for STA? About middle? Maybe not
@@ -2375,8 +2375,8 @@
lq_sta->is_dup = 0;
lq_sta->max_rate_idx = -1;
- lq_sta->missed_rate_counter = IWL_MISSED_RATE_MAX;
- lq_sta->is_green = iwl4965_rs_use_green(sta);
+ lq_sta->missed_rate_counter = IL_MISSED_RATE_MAX;
+ lq_sta->is_green = il4965_rs_use_green(sta);
lq_sta->active_legacy_rate = priv->active_rate & ~(0x1000);
lq_sta->band = priv->band;
/*
@@ -2386,69 +2386,69 @@
lq_sta->active_siso_rate = ht_cap->mcs.rx_mask[0] << 1;
lq_sta->active_siso_rate |= ht_cap->mcs.rx_mask[0] & 0x1;
lq_sta->active_siso_rate &= ~((u16)0x2);
- lq_sta->active_siso_rate <<= IWL_FIRST_OFDM_RATE;
+ lq_sta->active_siso_rate <<= IL_FIRST_OFDM_RATE;
/* Same here */
lq_sta->active_mimo2_rate = ht_cap->mcs.rx_mask[1] << 1;
lq_sta->active_mimo2_rate |= ht_cap->mcs.rx_mask[1] & 0x1;
lq_sta->active_mimo2_rate &= ~((u16)0x2);
- lq_sta->active_mimo2_rate <<= IWL_FIRST_OFDM_RATE;
+ lq_sta->active_mimo2_rate <<= IL_FIRST_OFDM_RATE;
/* These values will be overridden later */
lq_sta->lq.general_params.single_stream_ant_msk =
- iwl4965_first_antenna(priv->hw_params.valid_tx_ant);
+ il4965_first_antenna(priv->hw_params.valid_tx_ant);
lq_sta->lq.general_params.dual_stream_ant_msk =
priv->hw_params.valid_tx_ant &
- ~iwl4965_first_antenna(priv->hw_params.valid_tx_ant);
+ ~il4965_first_antenna(priv->hw_params.valid_tx_ant);
if (!lq_sta->lq.general_params.dual_stream_ant_msk) {
lq_sta->lq.general_params.dual_stream_ant_msk = ANT_AB;
- } else if (iwl4965_num_of_ant(priv->hw_params.valid_tx_ant) == 2) {
+ } else if (il4965_num_of_ant(priv->hw_params.valid_tx_ant) == 2) {
lq_sta->lq.general_params.dual_stream_ant_msk =
priv->hw_params.valid_tx_ant;
}
/* as default allow aggregation for all tids */
- lq_sta->tx_agg_tid_en = IWL_AGG_ALL_TID;
+ lq_sta->tx_agg_tid_en = IL_AGG_ALL_TID;
lq_sta->drv = priv;
/* Set last_txrate_idx to lowest rate */
lq_sta->last_txrate_idx = rate_lowest_index(sband, sta);
if (sband->band == IEEE80211_BAND_5GHZ)
- lq_sta->last_txrate_idx += IWL_FIRST_OFDM_RATE;
+ lq_sta->last_txrate_idx += IL_FIRST_OFDM_RATE;
lq_sta->is_agg = 0;
#ifdef CONFIG_MAC80211_DEBUGFS
lq_sta->dbg_fixed_rate = 0;
#endif
- iwl4965_rs_initialize_lq(priv, conf, sta, lq_sta);
+ il4965_rs_initialize_lq(priv, conf, sta, lq_sta);
}
-static void iwl4965_rs_fill_link_cmd(struct iwl_priv *priv,
- struct iwl_lq_sta *lq_sta, u32 new_rate)
+static void il4965_rs_fill_link_cmd(struct il_priv *priv,
+ struct il_lq_sta *lq_sta, u32 new_rate)
{
- struct iwl_scale_tbl_info tbl_type;
+ struct il_scale_tbl_info tbl_type;
int index = 0;
int rate_idx;
int repeat_rate = 0;
u8 ant_toggle_cnt = 0;
u8 use_ht_possible = 1;
u8 valid_tx_ant = 0;
- struct iwl_link_quality_cmd *lq_cmd = &lq_sta->lq;
+ struct il_link_quality_cmd *lq_cmd = &lq_sta->lq;
/* Override starting rate (index 0) if needed for debug purposes */
- iwl4965_rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
+ il4965_rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
/* Interpret new_rate (rate_n_flags) */
- iwl4965_rs_get_tbl_info_from_mcs(new_rate, lq_sta->band,
+ il4965_rs_get_tbl_info_from_mcs(new_rate, lq_sta->band,
&tbl_type, &rate_idx);
/* How many times should we repeat the initial rate? */
if (is_legacy(tbl_type.lq_type)) {
ant_toggle_cnt = 1;
- repeat_rate = IWL_NUMBER_TRY;
+ repeat_rate = IL_NUMBER_TRY;
} else {
- repeat_rate = IWL_HT_NUMBER_TRY;
+ repeat_rate = IL_HT_NUMBER_TRY;
}
lq_cmd->general_params.mimo_delimiter =
@@ -2457,10 +2457,10 @@
/* Fill 1st table entry (index 0) */
lq_cmd->rs_table[index].rate_n_flags = cpu_to_le32(new_rate);
- if (iwl4965_num_of_ant(tbl_type.ant_type) == 1) {
+ if (il4965_num_of_ant(tbl_type.ant_type) == 1) {
lq_cmd->general_params.single_stream_ant_msk =
tbl_type.ant_type;
- } else if (iwl4965_num_of_ant(tbl_type.ant_type) == 2) {
+ } else if (il4965_num_of_ant(tbl_type.ant_type) == 2) {
lq_cmd->general_params.dual_stream_ant_msk =
tbl_type.ant_type;
} /* otherwise we don't modify the existing value */
@@ -2473,20 +2473,20 @@
/* Fill rest of rate table */
while (index < LINK_QUAL_MAX_RETRY_NUM) {
/* Repeat initial/next rate.
- * For legacy IWL_NUMBER_TRY == 1, this loop will not execute.
- * For HT IWL_HT_NUMBER_TRY == 3, this executes twice. */
+ * For legacy IL_NUMBER_TRY == 1, this loop will not execute.
+ * For HT IL_HT_NUMBER_TRY == 3, this executes twice. */
while (repeat_rate > 0 && (index < LINK_QUAL_MAX_RETRY_NUM)) {
if (is_legacy(tbl_type.lq_type)) {
if (ant_toggle_cnt < NUM_TRY_BEFORE_ANT_TOGGLE)
ant_toggle_cnt++;
else if (priv &&
- iwl4965_rs_toggle_antenna(valid_tx_ant,
+ il4965_rs_toggle_antenna(valid_tx_ant,
&new_rate, &tbl_type))
ant_toggle_cnt = 1;
}
/* Override next rate if needed for debug purposes */
- iwl4965_rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
+ il4965_rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
/* Fill next table entry */
lq_cmd->rs_table[index].rate_n_flags =
@@ -2495,18 +2495,18 @@
index++;
}
- iwl4965_rs_get_tbl_info_from_mcs(new_rate,
+ il4965_rs_get_tbl_info_from_mcs(new_rate,
lq_sta->band, &tbl_type,
&rate_idx);
/* Indicate to uCode which entries might be MIMO.
* If initial rate was MIMO, this will finally end up
- * as (IWL_HT_NUMBER_TRY * 2), after 2nd pass, otherwise 0. */
+ * as (IL_HT_NUMBER_TRY * 2), after 2nd pass, otherwise 0. */
if (is_mimo(tbl_type.lq_type))
lq_cmd->general_params.mimo_delimiter = index;
/* Get next rate */
- new_rate = iwl4965_rs_get_lower_rate(lq_sta,
+ new_rate = il4965_rs_get_lower_rate(lq_sta,
&tbl_type, rate_idx,
use_ht_possible);
@@ -2515,21 +2515,21 @@
if (ant_toggle_cnt < NUM_TRY_BEFORE_ANT_TOGGLE)
ant_toggle_cnt++;
else if (priv &&
- iwl4965_rs_toggle_antenna(valid_tx_ant,
+ il4965_rs_toggle_antenna(valid_tx_ant,
&new_rate, &tbl_type))
ant_toggle_cnt = 1;
- repeat_rate = IWL_NUMBER_TRY;
+ repeat_rate = IL_NUMBER_TRY;
} else {
- repeat_rate = IWL_HT_NUMBER_TRY;
+ repeat_rate = IL_HT_NUMBER_TRY;
}
/* Don't allow HT rates after next pass.
- * iwl4965_rs_get_lower_rate() will change type to LQ_A or LQ_G. */
+ * il4965_rs_get_lower_rate() will change type to LQ_A or LQ_G. */
use_ht_possible = 0;
/* Override next rate if needed for debug purposes */
- iwl4965_rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
+ il4965_rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
/* Fill next table entry */
lq_cmd->rs_table[index].rate_n_flags = cpu_to_le32(new_rate);
@@ -2546,36 +2546,36 @@
}
static void
-*iwl4965_rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
+*il4965_rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
{
return hw->priv;
}
/* rate scale requires free function to be implemented */
-static void iwl4965_rs_free(void *priv_rate)
+static void il4965_rs_free(void *priv_rate)
{
return;
}
-static void iwl4965_rs_free_sta(void *priv_r, struct ieee80211_sta *sta,
+static void il4965_rs_free_sta(void *priv_r, struct ieee80211_sta *sta,
void *priv_sta)
{
- struct iwl_priv *priv __maybe_unused = priv_r;
+ struct il_priv *priv __maybe_unused = priv_r;
- IWL_DEBUG_RATE(priv, "enter\n");
- IWL_DEBUG_RATE(priv, "leave\n");
+ IL_DEBUG_RATE(priv, "enter\n");
+ IL_DEBUG_RATE(priv, "leave\n");
}
#ifdef CONFIG_MAC80211_DEBUGFS
-static int iwl4965_open_file_generic(struct inode *inode, struct file *file)
+static int il4965_open_file_generic(struct inode *inode, struct file *file)
{
file->private_data = inode->i_private;
return 0;
}
-static void iwl4965_rs_dbgfs_set_mcs(struct iwl_lq_sta *lq_sta,
+static void il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta,
u32 *rate_n_flags, int index)
{
- struct iwl_priv *priv;
+ struct il_priv *priv;
u8 valid_tx_ant;
u8 ant_sel_tx;
@@ -2587,30 +2587,30 @@
>> RATE_MCS_ANT_POS);
if ((valid_tx_ant & ant_sel_tx) == ant_sel_tx) {
*rate_n_flags = lq_sta->dbg_fixed_rate;
- IWL_DEBUG_RATE(priv, "Fixed rate ON\n");
+ IL_DEBUG_RATE(priv, "Fixed rate ON\n");
} else {
lq_sta->dbg_fixed_rate = 0;
- IWL_ERR(priv,
+ IL_ERR(priv,
"Invalid antenna selection 0x%X, Valid is 0x%X\n",
ant_sel_tx, valid_tx_ant);
- IWL_DEBUG_RATE(priv, "Fixed rate OFF\n");
+ IL_DEBUG_RATE(priv, "Fixed rate OFF\n");
}
} else {
- IWL_DEBUG_RATE(priv, "Fixed rate OFF\n");
+ IL_DEBUG_RATE(priv, "Fixed rate OFF\n");
}
}
-static ssize_t iwl4965_rs_sta_dbgfs_scale_table_write(struct file *file,
+static ssize_t il4965_rs_sta_dbgfs_scale_table_write(struct file *file,
const char __user *user_buf, size_t count, loff_t *ppos)
{
- struct iwl_lq_sta *lq_sta = file->private_data;
- struct iwl_priv *priv;
+ struct il_lq_sta *lq_sta = file->private_data;
+ struct il_priv *priv;
char buf[64];
size_t buf_size;
u32 parsed_rate;
- struct iwl_station_priv *sta_priv =
- container_of(lq_sta, struct iwl_station_priv, lq_sta);
- struct iwl_rxon_context *ctx = sta_priv->common.ctx;
+ struct il_station_priv *sta_priv =
+ container_of(lq_sta, struct il_station_priv, lq_sta);
+ struct il_rxon_context *ctx = sta_priv->common.ctx;
priv = lq_sta->drv;
memset(buf, 0, sizeof(buf));
@@ -2627,19 +2627,19 @@
lq_sta->active_siso_rate = 0x1FD0; /* 6 - 60 MBits, no 9, no CCK */
lq_sta->active_mimo2_rate = 0x1FD0; /* 6 - 60 MBits, no 9, no CCK */
- IWL_DEBUG_RATE(priv, "sta_id %d rate 0x%X\n",
+ IL_DEBUG_RATE(priv, "sta_id %d rate 0x%X\n",
lq_sta->lq.sta_id, lq_sta->dbg_fixed_rate);
if (lq_sta->dbg_fixed_rate) {
- iwl4965_rs_fill_link_cmd(NULL, lq_sta, lq_sta->dbg_fixed_rate);
- iwl_legacy_send_lq_cmd(lq_sta->drv, ctx, &lq_sta->lq, CMD_ASYNC,
+ il4965_rs_fill_link_cmd(NULL, lq_sta, lq_sta->dbg_fixed_rate);
+ il_send_lq_cmd(lq_sta->drv, ctx, &lq_sta->lq, CMD_ASYNC,
false);
}
return count;
}
-static ssize_t iwl4965_rs_sta_dbgfs_scale_table_read(struct file *file,
+static ssize_t il4965_rs_sta_dbgfs_scale_table_read(struct file *file,
char __user *user_buf, size_t count, loff_t *ppos)
{
char *buff;
@@ -2648,9 +2648,9 @@
int index = 0;
ssize_t ret;
- struct iwl_lq_sta *lq_sta = file->private_data;
- struct iwl_priv *priv;
- struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
+ struct il_lq_sta *lq_sta = file->private_data;
+ struct il_priv *priv;
+ struct il_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
priv = lq_sta->drv;
buff = kmalloc(1024, GFP_KERNEL);
@@ -2702,19 +2702,19 @@
lq_sta->lq.general_params.start_rate_index[3]);
for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++) {
- index = iwl4965_hwrate_to_plcp_idx(
+ index = il4965_hwrate_to_plcp_idx(
le32_to_cpu(lq_sta->lq.rs_table[i].rate_n_flags));
if (is_legacy(tbl->lq_type)) {
desc += sprintf(buff+desc, " rate[%d] 0x%X %smbps\n",
i,
le32_to_cpu(lq_sta->lq.rs_table[i].rate_n_flags),
- iwl_rate_mcs[index].mbps);
+ il_rate_mcs[index].mbps);
} else {
desc += sprintf(buff+desc,
" rate[%d] 0x%X %smbps (%s)\n",
i,
le32_to_cpu(lq_sta->lq.rs_table[i].rate_n_flags),
- iwl_rate_mcs[index].mbps, iwl_rate_mcs[index].mcs);
+ il_rate_mcs[index].mbps, il_rate_mcs[index].mcs);
}
}
@@ -2724,12 +2724,12 @@
}
static const struct file_operations rs_sta_dbgfs_scale_table_ops = {
- .write = iwl4965_rs_sta_dbgfs_scale_table_write,
- .read = iwl4965_rs_sta_dbgfs_scale_table_read,
- .open = iwl4965_open_file_generic,
+ .write = il4965_rs_sta_dbgfs_scale_table_write,
+ .read = il4965_rs_sta_dbgfs_scale_table_read,
+ .open = il4965_open_file_generic,
.llseek = default_llseek,
};
-static ssize_t iwl4965_rs_sta_dbgfs_stats_table_read(struct file *file,
+static ssize_t il4965_rs_sta_dbgfs_stats_table_read(struct file *file,
char __user *user_buf, size_t count, loff_t *ppos)
{
char *buff;
@@ -2737,7 +2737,7 @@
int i, j;
ssize_t ret;
- struct iwl_lq_sta *lq_sta = file->private_data;
+ struct il_lq_sta *lq_sta = file->private_data;
buff = kmalloc(1024, GFP_KERNEL);
if (!buff)
@@ -2754,7 +2754,7 @@
lq_sta->lq_info[i].is_dup,
lq_sta->is_green,
lq_sta->lq_info[i].current_rate);
- for (j = 0; j < IWL_RATE_COUNT; j++) {
+ for (j = 0; j < IL_RATE_COUNT; j++) {
desc += sprintf(buff+desc,
"counter=%d success=%d %%=%d\n",
lq_sta->lq_info[i].win[j].counter,
@@ -2768,21 +2768,21 @@
}
static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
- .read = iwl4965_rs_sta_dbgfs_stats_table_read,
- .open = iwl4965_open_file_generic,
+ .read = il4965_rs_sta_dbgfs_stats_table_read,
+ .open = il4965_open_file_generic,
.llseek = default_llseek,
};
-static ssize_t iwl4965_rs_sta_dbgfs_rate_scale_data_read(struct file *file,
+static ssize_t il4965_rs_sta_dbgfs_rate_scale_data_read(struct file *file,
char __user *user_buf, size_t count, loff_t *ppos)
{
char buff[120];
int desc = 0;
ssize_t ret;
- struct iwl_lq_sta *lq_sta = file->private_data;
- struct iwl_priv *priv;
- struct iwl_scale_tbl_info *tbl = &lq_sta->lq_info[lq_sta->active_tbl];
+ struct il_lq_sta *lq_sta = file->private_data;
+ struct il_priv *priv;
+ struct il_scale_tbl_info *tbl = &lq_sta->lq_info[lq_sta->active_tbl];
priv = lq_sta->drv;
@@ -2800,15 +2800,15 @@
}
static const struct file_operations rs_sta_dbgfs_rate_scale_data_ops = {
- .read = iwl4965_rs_sta_dbgfs_rate_scale_data_read,
- .open = iwl4965_open_file_generic,
+ .read = il4965_rs_sta_dbgfs_rate_scale_data_read,
+ .open = il4965_open_file_generic,
.llseek = default_llseek,
};
-static void iwl4965_rs_add_debugfs(void *priv, void *priv_sta,
+static void il4965_rs_add_debugfs(void *priv, void *priv_sta,
struct dentry *dir)
{
- struct iwl_lq_sta *lq_sta = priv_sta;
+ struct il_lq_sta *lq_sta = priv_sta;
lq_sta->rs_sta_dbgfs_scale_table_file =
debugfs_create_file("rate_scale_table", S_IRUSR | S_IWUSR, dir,
lq_sta, &rs_sta_dbgfs_scale_table_ops);
@@ -2824,9 +2824,9 @@
}
-static void iwl4965_rs_remove_debugfs(void *priv, void *priv_sta)
+static void il4965_rs_remove_debugfs(void *priv, void *priv_sta)
{
- struct iwl_lq_sta *lq_sta = priv_sta;
+ struct il_lq_sta *lq_sta = priv_sta;
debugfs_remove(lq_sta->rs_sta_dbgfs_scale_table_file);
debugfs_remove(lq_sta->rs_sta_dbgfs_stats_table_file);
debugfs_remove(lq_sta->rs_sta_dbgfs_rate_scale_data_file);
@@ -2840,32 +2840,32 @@
* station is added we ignore it.
*/
static void
-iwl4965_rs_rate_init_stub(void *priv_r, struct ieee80211_supported_band *sband,
+il4965_rs_rate_init_stub(void *priv_r, struct ieee80211_supported_band *sband,
struct ieee80211_sta *sta, void *priv_sta)
{
}
static struct rate_control_ops rs_4965_ops = {
.module = NULL,
.name = IWL4965_RS_NAME,
- .tx_status = iwl4965_rs_tx_status,
- .get_rate = iwl4965_rs_get_rate,
- .rate_init = iwl4965_rs_rate_init_stub,
- .alloc = iwl4965_rs_alloc,
- .free = iwl4965_rs_free,
- .alloc_sta = iwl4965_rs_alloc_sta,
- .free_sta = iwl4965_rs_free_sta,
+ .tx_status = il4965_rs_tx_status,
+ .get_rate = il4965_rs_get_rate,
+ .rate_init = il4965_rs_rate_init_stub,
+ .alloc = il4965_rs_alloc,
+ .free = il4965_rs_free,
+ .alloc_sta = il4965_rs_alloc_sta,
+ .free_sta = il4965_rs_free_sta,
#ifdef CONFIG_MAC80211_DEBUGFS
- .add_sta_debugfs = iwl4965_rs_add_debugfs,
- .remove_sta_debugfs = iwl4965_rs_remove_debugfs,
+ .add_sta_debugfs = il4965_rs_add_debugfs,
+ .remove_sta_debugfs = il4965_rs_remove_debugfs,
#endif
};
-int iwl4965_rate_control_register(void)
+int il4965_rate_control_register(void)
{
return ieee80211_rate_control_register(&rs_4965_ops);
}
-void iwl4965_rate_control_unregister(void)
+void il4965_rate_control_unregister(void)
{
ieee80211_rate_control_unregister(&rs_4965_ops);
}