aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ath/ath9k')
-rw-r--r--drivers/net/wireless/ath/ath9k/rc.c23
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 630fcf46e0dd..e66734c2cae1 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,
786 tx_info->control.rts_cts_rate_idx = cix; 786 tx_info->control.rts_cts_rate_idx = cix;
787} 787}
788 788
789static void ath_rc_ratefind(struct ath_softc *sc, 789static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
790 struct ath_rate_priv *ath_rc_priv, 790 struct ieee80211_tx_rate_control *txrc)
791 struct ieee80211_tx_rate_control *txrc)
792{ 791{
792 struct ath_softc *sc = priv;
793 struct ath_rate_priv *ath_rc_priv = priv_sta;
793 const struct ath_rate_table *rate_table; 794 const struct ath_rate_table *rate_table;
794 struct sk_buff *skb = txrc->skb; 795 struct sk_buff *skb = txrc->skb;
795 struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); 796 struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
@@ -799,6 +800,9 @@ static void ath_rc_ratefind(struct ath_softc *sc,
799 u8 try_per_rate, i = 0, rix, nrix; 800 u8 try_per_rate, i = 0, rix, nrix;
800 int is_probe = 0; 801 int is_probe = 0;
801 802
803 if (rate_control_send_low(sta, priv_sta, txrc))
804 return;
805
802 /* 806 /*
803 * For Multi Rate Retry we use a different number of 807 * For Multi Rate Retry we use a different number of
804 * retry attempt counts. This ends up looking like this: 808 * retry attempt counts. This ends up looking like this:
@@ -1515,19 +1519,6 @@ exit:
1515 kfree(tx_info_priv); 1519 kfree(tx_info_priv);
1516} 1520}
1517 1521
1518static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
1519 struct ieee80211_tx_rate_control *txrc)
1520{
1521 struct ath_softc *sc = priv;
1522 struct ath_rate_priv *ath_rc_priv = priv_sta;
1523
1524 if (rate_control_send_low(sta, priv_sta, txrc))
1525 return;
1526
1527 /* Find tx rate for unicast frames */
1528 ath_rc_ratefind(sc, ath_rc_priv, txrc);
1529}
1530
1531static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband, 1522static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband,
1532 struct ieee80211_sta *sta, void *priv_sta) 1523 struct ieee80211_sta *sta, void *priv_sta)
1533{ 1524{