adm5120: add CONFIG_PCI=y on router_le too

[openwrt.git] / package / mac80211 / patches / 560-minstrel_ht.patch

diff --git a/package/mac80211/patches/560-minstrel_ht.patch b/package/mac80211/patches/560-minstrel_ht.patch
index 9fa9e05..6c3d08e 100644 (file)
--- a/package/mac80211/patches/560-minstrel_ht.patch
+++ b/package/mac80211/patches/560-minstrel_ht.patch
@@ -68,7 +68,7 @@
  
 --- /dev/null
 +++ b/net/mac80211/rc80211_minstrel_ht.c
  
 --- /dev/null
 +++ b/net/mac80211/rc80211_minstrel_ht.c

-@@ -0,0 +1,807 @@
+@@ -0,0 +1,809 @@

 +/*
 + * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
 + *
 +/*
 + * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
 + *


@@ -479,13 +479,15 @@
 +       * downgrade to a lower number of streams if necessary.
 +       */
 +      rate = minstrel_get_ratestats(mi, mi->max_tp_rate);
 +       * downgrade to a lower number of streams if necessary.
 +       */
 +      rate = minstrel_get_ratestats(mi, mi->max_tp_rate);

-+      if (MINSTREL_FRAC(rate->success, rate->attempts) <
-+          MINSTREL_FRAC(20, 100) && rate->attempts > 30)
++      if (rate->attempts > 30 &&
++          MINSTREL_FRAC(rate->success, rate->attempts) <
++          MINSTREL_FRAC(20, 100))

 +              minstrel_downgrade_rate(mi, &mi->max_tp_rate, true);
 +
 +      rate2 = minstrel_get_ratestats(mi, mi->max_tp_rate2);
 +              minstrel_downgrade_rate(mi, &mi->max_tp_rate, true);
 +
 +      rate2 = minstrel_get_ratestats(mi, mi->max_tp_rate2);

-+      if (MINSTREL_FRAC(rate->success, rate->attempts) <
-+          MINSTREL_FRAC(20, 100) && rate->attempts > 30)
++      if (rate->attempts > 30 &&
++          MINSTREL_FRAC(rate->success, rate->attempts) <
++          MINSTREL_FRAC(20, 100))

 +              minstrel_downgrade_rate(mi, &mi->max_tp_rate2, false);
 +
 +      if (time_after(jiffies, mi->stats_update + (mp->update_interval / 2 * HZ) / 1000))
 +              minstrel_downgrade_rate(mi, &mi->max_tp_rate2, false);
 +
 +      if (time_after(jiffies, mi->stats_update + (mp->update_interval / 2 * HZ) / 1000))


@@ -599,7 +601,7 @@
 +       */
 +      if (minstrel_get_duration(sample_idx) >
 +          minstrel_get_duration(mi->max_tp_rate)) {
 +       */
 +      if (minstrel_get_duration(sample_idx) >
 +          minstrel_get_duration(mi->max_tp_rate)) {

-+          if (mr->sample_skipped < 10)
++              if (mr->sample_skipped < 10)

 +                      goto next;
 +
 +              if (mi->sample_slow++ > 2)
 +                      goto next;
 +
 +              if (mi->sample_slow++ > 2)


@@ -1062,7 +1064,7 @@
 +                      struct minstrel_rate_stats *mr = &mi->groups[i].rates[j];
 +                      int idx = i * MCS_GROUP_RATES + j;
 +
 +                      struct minstrel_rate_stats *mr = &mi->groups[i].rates[j];
 +                      int idx = i * MCS_GROUP_RATES + j;
 +

-+                      if (!mi->groups[i].supported & BIT(j))
++                      if (!(mi->groups[i].supported & BIT(j)))

 +                              continue;
 +
 +                      p += sprintf(p, "HT%c0/%cGI ", htmode, gimode);
 +                              continue;
 +
 +                      p += sprintf(p, "HT%c0/%cGI ", htmode, gimode);