Skip to content

Commit

Permalink
ath9k: remove rate control wraper
Browse files Browse the repository at this point in the history
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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Luis R. Rodriguez authored and John W. Linville committed Jul 24, 2009
1 parent 4c6d4f5 commit e25739a
Showing 1 changed file with 7 additions and 16 deletions.
23 changes: 7 additions & 16 deletions drivers/net/wireless/ath/ath9k/rc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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:
Expand Down Expand Up @@ -1515,19 +1519,6 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband,
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)
{
Expand Down

0 comments on commit e25739a

Please sign in to comment.