package/mac80211/patches/530-ath9k_rc_fallback.patch

   1 --- a/drivers/net/wireless/ath/ath9k/rc.c
   2 +++ b/drivers/net/wireless/ath/ath9k/rc.c
   3 @@ -668,7 +668,7 @@ static void ath_get_rate(void *priv, str
   4         struct ieee80211_tx_rate *rates = tx_info->control.rates;
   5         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
   6         __le16 fc = hdr->frame_control;
   7 -       u8 try_per_rate, i = 0, rix, nrix;
   8 +       u8 try_per_rate, i = 0, rix;
   9         int is_probe = 0;
  10
  11         if (rate_control_send_low(sta, priv_sta, txrc))
  12 @@ -688,26 +688,25 @@ static void ath_get_rate(void *priv, str
  13
  14         rate_table = sc->cur_rate_table;
  15         rix = ath_rc_get_highest_rix(sc, ath_rc_priv, rate_table, &is_probe);
  16 -       nrix = rix;
  17
  18         if (is_probe) {
  19                 /* set one try for probe rates. For the
  20                  * probes don't enable rts */
  21                 ath_rc_rate_set_series(rate_table, &rates[i++], txrc,
  22 -                                      1, nrix, 0);
  23 +                                      1, rix, 0);
  24
  25                 /* Get the next tried/allowed rate. No RTS for the next series
  26                  * after the probe rate
  27                  */
  28 -               ath_rc_get_lower_rix(rate_table, ath_rc_priv, rix, &nrix);
  29 +               ath_rc_get_lower_rix(rate_table, ath_rc_priv, rix, &rix);
  30                 ath_rc_rate_set_series(rate_table, &rates[i++], txrc,
  31 -                                      try_per_rate, nrix, 0);
  32 +                                      try_per_rate, rix, 0);
  33
  34                 tx_info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE;
  35         } else {
  36                 /* Set the choosen rate. No RTS for first series entry. */
  37                 ath_rc_rate_set_series(rate_table, &rates[i++], txrc,
  38 -                                      try_per_rate, nrix, 0);
  39 +                                      try_per_rate, rix, 0);
  40         }
  41
  42         /* Fill in the other rates for multirate retry */
  43 @@ -716,10 +715,10 @@ static void ath_get_rate(void *priv, str
  44                 if (i + 1 == 4)
  45                         try_per_rate = 8;
  46
  47 -               ath_rc_get_lower_rix(rate_table, ath_rc_priv, rix, &nrix);
  48 +               ath_rc_get_lower_rix(rate_table, ath_rc_priv, rix, &rix);
  49                 /* All other rates in the series have RTS enabled */
  50                 ath_rc_rate_set_series(rate_table, &rates[i], txrc,
  51 -                                      try_per_rate, nrix, 1);
  52 +                                      try_per_rate, rix, 1);
  53         }
  54
  55         /*