public inbox for linux-wireless@vger.kernel.org
 help / color / mirror / Atom feed
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 17/21] ath9k: remove rate control wraper
Date: Tue, 14 Jul 2009 20:14:09 -0400	[thread overview]
Message-ID: <1247616853-11221-18-git-send-email-lrodriguez@atheros.com> (raw)
In-Reply-To: <1247616853-11221-1-git-send-email-lrodriguez@atheros.com>

After the cleanup we just use get_rate as a wrapper, skip
the wrapper.

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 |   23 +++++++----------------
 1 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 630fcf4..e66734c 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -786,10 +786,11 @@ static void ath_rc_rate_set_rtscts(struct ath_softc *sc,
 	tx_info->control.rts_cts_rate_idx = cix;
 }
 
-static void ath_rc_ratefind(struct ath_softc *sc,
-			    struct ath_rate_priv *ath_rc_priv,
-			    struct ieee80211_tx_rate_control *txrc)
+static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
+			 struct ieee80211_tx_rate_control *txrc)
 {
+	struct ath_softc *sc = priv;
+	struct ath_rate_priv *ath_rc_priv = priv_sta;
 	const struct ath_rate_table *rate_table;
 	struct sk_buff *skb = txrc->skb;
 	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
@@ -799,6 +800,9 @@ static void ath_rc_ratefind(struct ath_softc *sc,
 	u8 try_per_rate, i = 0, rix, nrix;
 	int is_probe = 0;
 
+	if (rate_control_send_low(sta, priv_sta, txrc))
+		return;
+
 	/*
 	 * For Multi Rate Retry we use a different number of
 	 * retry attempt counts. This ends up looking like this:
@@ -1515,19 +1519,6 @@ exit:
 	kfree(tx_info_priv);
 }
 
-static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
-			 struct ieee80211_tx_rate_control *txrc)
-{
-	struct ath_softc *sc = priv;
-	struct ath_rate_priv *ath_rc_priv = priv_sta;
-
-	if (rate_control_send_low(sta, priv_sta, txrc))
-		return;
-
-	/* Find tx rate for unicast frames */
-	ath_rc_ratefind(sc, ath_rc_priv, txrc);
-}
-
 static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband,
                           struct ieee80211_sta *sta, void *priv_sta)
 {
-- 
1.6.0.6


  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 ` [PATCH 05/21] ath9k: remove unused min rate calculation code Luis R. Rodriguez
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 ` Luis R. Rodriguez [this message]
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-18-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