forked from Minki/linux
ath9k: remove rate control wraper
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>
This commit is contained in:
parent
4c6d4f5c33
commit
e25739a171
@ -786,10 +786,11 @@ static void ath_rc_rate_set_rtscts(struct ath_softc *sc,
|
|||||||
tx_info->control.rts_cts_rate_idx = cix;
|
tx_info->control.rts_cts_rate_idx = cix;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ath_rc_ratefind(struct ath_softc *sc,
|
static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
|
||||||
struct ath_rate_priv *ath_rc_priv,
|
struct ieee80211_tx_rate_control *txrc)
|
||||||
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;
|
const struct ath_rate_table *rate_table;
|
||||||
struct sk_buff *skb = txrc->skb;
|
struct sk_buff *skb = txrc->skb;
|
||||||
struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(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;
|
u8 try_per_rate, i = 0, rix, nrix;
|
||||||
int is_probe = 0;
|
int is_probe = 0;
|
||||||
|
|
||||||
|
if (rate_control_send_low(sta, priv_sta, txrc))
|
||||||
|
return;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* For Multi Rate Retry we use a different number of
|
* For Multi Rate Retry we use a different number of
|
||||||
* retry attempt counts. This ends up looking like this:
|
* retry attempt counts. This ends up looking like this:
|
||||||
@ -1515,19 +1519,6 @@ exit:
|
|||||||
kfree(tx_info_priv);
|
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,
|
static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband,
|
||||||
struct ieee80211_sta *sta, void *priv_sta)
|
struct ieee80211_sta *sta, void *priv_sta)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user