From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
To: linville@tuxdriver.com, johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org, ath9k-devel@lists.ath9k.org,
"Luis R. Rodriguez" <lrodriguez@atheros.com>,
Derek Smithies <derek@indranet.co.nz>,
Chittajit Mitra <Chittajit.Mitra@Atheros.com>
Subject: [PATCH 05/21] ath9k: remove unused min rate calculation code
Date: Tue, 14 Jul 2009 20:13:57 -0400 [thread overview]
Message-ID: <1247616853-11221-6-git-send-email-lrodriguez@atheros.com> (raw)
In-Reply-To: <1247616853-11221-1-git-send-email-lrodriguez@atheros.com>
This is not used, and when we need to get the lowest rate
we should simply use mac80211's own rate_lowest_index(sband, sta).
Cc: Derek Smithies <derek@indranet.co.nz>
Cc: Chittajit Mitra <Chittajit.Mitra@Atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/ath/ath9k/rc.c | 33 +++++++++------------------------
1 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index a23b66b..7b37b27 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -817,28 +817,17 @@ static void ath_rc_rate_set_rtscts(struct ath_softc *sc,
static u8 ath_rc_rate_getidx(struct ath_softc *sc,
struct ath_rate_priv *ath_rc_priv,
const struct ath_rate_table *rate_table,
- u8 rix, u16 stepdown,
- u16 min_rate)
+ u8 rix, u16 stepdown)
{
u32 j;
u8 nextindex = 0;
- if (min_rate) {
- for (j = RATE_TABLE_SIZE; j > 0; j--) {
- if (ath_rc_get_nextlowervalid_txrate(rate_table,
- ath_rc_priv, rix, &nextindex))
- rix = nextindex;
- else
- break;
- }
- } else {
- for (j = stepdown; j > 0; j--) {
- if (ath_rc_get_nextlowervalid_txrate(rate_table,
- ath_rc_priv, rix, &nextindex))
- rix = nextindex;
- else
- break;
- }
+ for (j = stepdown; j > 0; j--) {
+ if (ath_rc_get_nextlowervalid_txrate(rate_table,
+ ath_rc_priv, rix, &nextindex))
+ rix = nextindex;
+ else
+ break;
}
return rix;
}
@@ -882,7 +871,7 @@ static void ath_rc_ratefind(struct ath_softc *sc,
* after the probe rate
*/
nrix = ath_rc_rate_getidx(sc, ath_rc_priv,
- rate_table, nrix, 1, 0);
+ rate_table, nrix, 1);
ath_rc_rate_set_series(rate_table, &rates[i++], txrc,
try_per_rate, nrix, 0);
@@ -895,16 +884,12 @@ static void ath_rc_ratefind(struct ath_softc *sc,
/* Fill in the other rates for multirate retry */
for ( ; i < 4; i++) {
- u8 min_rate;
-
/* Use twice the number of tries for the last MRR segment. */
if (i + 1 == 4)
try_per_rate = 4;
- min_rate = (((i + 1) == 4) && 0);
-
nrix = ath_rc_rate_getidx(sc, ath_rc_priv,
- rate_table, nrix, 1, min_rate);
+ rate_table, nrix, 1);
/* All other rates in the series have RTS enabled */
ath_rc_rate_set_series(rate_table, &rates[i], txrc,
try_per_rate, nrix, 1);
--
1.6.0.6
next prev parent reply other threads:[~2009-07-15 0:14 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-15 0:13 [PATCH 00/21] ath9k/iwlwifi/mac80211: rate cleanup Luis R. Rodriguez
2009-07-15 0:13 ` [PATCH 01/21] mac80211: drop frames for sta with no valid rate Luis R. Rodriguez
2009-07-15 11:58 ` Johannes Berg
2009-07-15 14:56 ` Luis R. Rodriguez
2009-07-15 16:05 ` Johannes Berg
2009-07-15 0:13 ` [PATCH 02/21] ath9k: downgrade assert in rc.c for invalid rate Luis R. Rodriguez
2009-07-15 0:13 ` [PATCH 03/21] iwlwifi: remove rs_get_rate workaround Luis R. Rodriguez
2009-07-15 20:32 ` reinette chatre
2009-07-15 0:13 ` [PATCH 04/21] ath9k: cleanup try count for MRR in rate control Luis R. Rodriguez
2009-07-15 0:13 ` Luis R. Rodriguez [this message]
2009-07-15 0:13 ` [PATCH 06/21] ath9k: remove unused stepdown when looking for the next rate Luis R. Rodriguez
2009-07-15 0:13 ` [PATCH 07/21] ath9k: remove pointless wrapper ath_rc_rate_getidx() Luis R. Rodriguez
2009-07-15 0:14 ` [PATCH 08/21] ath9k: rename ath_rc_get_nextlowervalid_txrate() Luis R. Rodriguez
2009-07-15 0:14 ` [PATCH 09/21] ath9k: remove unused ath_rc_isvalid_txmask() Luis R. Rodriguez
2009-07-15 0:14 ` [PATCH 10/21] ath9k: remove ATH9K_MODE_11B Luis R. Rodriguez
2009-07-15 0:14 ` [PATCH 11/21] ath9k: remap ATH9K_MODE_* Luis R. Rodriguez
2009-07-15 0:14 ` [PATCH 12/21] ath9k: rename ath_rc_ratefind_ht() to ath_rc_get_highest_rix() Luis R. Rodriguez
2009-07-15 0:14 ` [PATCH 13/21] ath9k: remove unnecessary IEEE80211_TX_CTL_NO_ACK checks Luis R. Rodriguez
2009-07-15 0:14 ` [PATCH 14/21] mac80211: make minstrel/pid RC use ieee80211_is_data(fc) Luis R. Rodriguez
2009-07-15 0:14 ` [PATCH 15/21] iwlwifi: " Luis R. Rodriguez
2009-07-15 20:33 ` reinette chatre
2009-07-15 0:14 ` [PATCH 16/21] mac80211: add helper for management / no-ack frame rate decision Luis R. Rodriguez
2009-07-15 20:33 ` reinette chatre
2009-07-16 17:00 ` [ath9k-devel] " Luis R. Rodriguez
2009-07-15 0:14 ` [PATCH 17/21] ath9k: remove rate control wraper Luis R. Rodriguez
2009-07-15 0:14 ` [PATCH 18/21] ath9k: Remove dead code in rate control Luis R. Rodriguez
2009-07-15 0:14 ` [PATCH 19/21] ath9k: Remove unused members from rate control structure Luis R. Rodriguez
2009-07-15 0:14 ` [PATCH 20/21] ath9k: Use probe interval instead of rssi reduce interval Luis R. Rodriguez
2009-07-15 0:14 ` [PATCH 21/21] ath9k: Nuke struct ath_tx_ratectrl_state Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1247616853-11221-6-git-send-email-lrodriguez@atheros.com \
--to=lrodriguez@atheros.com \
--cc=Chittajit.Mitra@Atheros.com \
--cc=ath9k-devel@lists.ath9k.org \
--cc=derek@indranet.co.nz \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox