Commit a741b995 authored by Greg Dietsche's avatar Greg Dietsche Committed by Stanislaw Gruszka

iwlegacy: 4965-rs: don't return rate from il4965_rs_update_rate_tbl

1) don't return rate from il4965_rs_update_rate_tbl
2) fix up il4965_rs_rate_scale_perform
Signed-off-by: default avatarGreg Dietsche <Gregory.Dietsche@cuw.edu>
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
parent 3e4b0655
...@@ -1731,9 +1731,8 @@ il4965_rs_stay_in_table(struct il_lq_sta *lq_sta, bool force_search) ...@@ -1731,9 +1731,8 @@ il4965_rs_stay_in_table(struct il_lq_sta *lq_sta, bool force_search)
/* /*
* setup rate table in uCode * setup rate table in uCode
* return rate_n_flags as used in the table
*/ */
static u32 static void
il4965_rs_update_rate_tbl(struct il_priv *il, struct il_rxon_context *ctx, il4965_rs_update_rate_tbl(struct il_priv *il, struct il_rxon_context *ctx,
struct il_lq_sta *lq_sta, struct il_lq_sta *lq_sta,
struct il_scale_tbl_info *tbl, int idx, u8 is_green) struct il_scale_tbl_info *tbl, int idx, u8 is_green)
...@@ -1744,8 +1743,6 @@ il4965_rs_update_rate_tbl(struct il_priv *il, struct il_rxon_context *ctx, ...@@ -1744,8 +1743,6 @@ il4965_rs_update_rate_tbl(struct il_priv *il, struct il_rxon_context *ctx,
rate = il4965_rate_n_flags_from_tbl(il, tbl, idx, is_green); rate = il4965_rate_n_flags_from_tbl(il, tbl, idx, is_green);
il4965_rs_fill_link_cmd(il, lq_sta, rate); il4965_rs_fill_link_cmd(il, lq_sta, rate);
il_send_lq_cmd(il, ctx, &lq_sta->lq, CMD_ASYNC, false); il_send_lq_cmd(il, ctx, &lq_sta->lq, CMD_ASYNC, false);
return rate;
} }
/* /*
...@@ -1774,7 +1771,6 @@ il4965_rs_rate_scale_perform(struct il_priv *il, struct sk_buff *skb, ...@@ -1774,7 +1771,6 @@ il4965_rs_rate_scale_perform(struct il_priv *il, struct sk_buff *skb,
u8 update_lq = 0; u8 update_lq = 0;
struct il_scale_tbl_info *tbl, *tbl1; struct il_scale_tbl_info *tbl, *tbl1;
u16 rate_scale_idx_msk = 0; u16 rate_scale_idx_msk = 0;
u32 rate;
u8 is_green = 0; u8 is_green = 0;
u8 active_tbl = 0; u8 active_tbl = 0;
u8 done_search = 0; u8 done_search = 0;
...@@ -1858,7 +1854,6 @@ il4965_rs_rate_scale_perform(struct il_priv *il, struct sk_buff *skb, ...@@ -1858,7 +1854,6 @@ il4965_rs_rate_scale_perform(struct il_priv *il, struct sk_buff *skb,
tbl = &(lq_sta->lq_info[lq_sta->active_tbl]); tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
/* get "active" rate info */ /* get "active" rate info */
idx = il4965_hwrate_to_plcp_idx(tbl->current_rate); idx = il4965_hwrate_to_plcp_idx(tbl->current_rate);
rate =
il4965_rs_update_rate_tbl(il, ctx, lq_sta, tbl, idx, il4965_rs_update_rate_tbl(il, ctx, lq_sta, tbl, idx,
is_green); is_green);
} }
...@@ -2062,7 +2057,6 @@ il4965_rs_rate_scale_perform(struct il_priv *il, struct sk_buff *skb, ...@@ -2062,7 +2057,6 @@ il4965_rs_rate_scale_perform(struct il_priv *il, struct sk_buff *skb,
lq_update: lq_update:
/* Replace uCode's rate table for the destination station. */ /* Replace uCode's rate table for the destination station. */
if (update_lq) if (update_lq)
rate =
il4965_rs_update_rate_tbl(il, ctx, lq_sta, tbl, idx, il4965_rs_update_rate_tbl(il, ctx, lq_sta, tbl, idx,
is_green); is_green);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment