Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e25739a1 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

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: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4c6d4f5c

drivers/net/wireless/ath/ath9k/rc.c

+7 −16
Original line number Diff line number Diff line
@@ -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,

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 @@ 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)

{