package/madwifi/patches-r3776/310-minstrel_sampling.patch

   1 Index: madwifi-trunk-r3776/ath/if_ath.c
   2 ===================================================================
   3 --- madwifi-trunk-r3776.orig/ath/if_ath.c       2008-07-17 02:28:06.000000000 +0200
   4 +++ madwifi-trunk-r3776/ath/if_ath.c    2008-07-17 02:37:41.000000000 +0200
   5 @@ -8109,6 +8109,7 @@
   6                 ath_hal_setupxtxdesc(sc->sc_ah, ds, mrr.rate1, mrr.retries1,
   7                                      mrr.rate2, mrr.retries2,
   8                                      mrr.rate3, mrr.retries3);
   9 +               bf->rcflags = mrr.privflags;
  10         }
  11
  12  #ifndef ATH_SUPERG_FF
  13 Index: madwifi-trunk-r3776/ath/if_athvar.h
  14 ===================================================================
  15 --- madwifi-trunk-r3776.orig/ath/if_athvar.h    2008-07-17 02:20:51.000000000 +0200
  16 +++ madwifi-trunk-r3776/ath/if_athvar.h 2008-07-17 02:37:41.000000000 +0200
  17 @@ -454,6 +454,7 @@
  18         u_int16_t bf_flags;                             /* tx descriptor flags */
  19         u_int64_t bf_tsf;
  20         int16_t bf_channoise;
  21 +       unsigned int rcflags;
  22  #ifdef ATH_SUPERG_FF
  23         /* XXX: combine this with bf_skbaddr if it ever changes to accommodate
  24          *      multiple segments.
  25 Index: madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c
  26 ===================================================================
  27 --- madwifi-trunk-r3776.orig/ath_rate/minstrel/minstrel.c       2008-07-17 02:27:44.000000000 +0200
  28 +++ madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c    2008-07-17 02:39:20.000000000 +0200
  29 @@ -341,18 +341,21 @@
  30                 if (sn->static_rate_ndx >= 0) {
  31                             ndx = sn->static_rate_ndx;
  32                 } else {
  33 +                       int delta;
  34 +
  35                         sn->packet_count++;
  36                         sn->random_n = (sn->a * sn->random_n) + sn->b;
  37                         offset = sn->random_n & 0xf;
  38
  39 -                       if ((((100 * sn->sample_count) / sn->packet_count) <
  40 -                                        ath_lookaround_rate) &&
  41 -                                       (offset < 2)) {
  42 +                       delta = (sn->packet_count * ath_lookaround_rate / 100) - sn->sample_count;
  43 +                       if ((delta > 0) && (offset < 2)) {
  44                                 sn->sample_count++;
  45                                 sn->is_sampling = 1;
  46                                 if (sn->packet_count >= 10000) {
  47                                         sn->sample_count = 0;
  48                                         sn->packet_count = 0;
  49 +                               } else if (delta > sn->num_rates * 2) {
  50 +                                       sn->sample_count += ((delta - sn->num_rates * 2) * ath_lookaround_rate) / 100;
  51                                 }
  52
  53                                 /* Don't look for slowest rate (i.e. slowest
  54 @@ -420,11 +423,14 @@
  55                 if (sn->num_rates <= 0)
  56                         return;
  57
  58 +               mrr->privflags = sn->is_sampling;
  59                 if (sn->is_sampling) {
  60                         sn->is_sampling = 0;
  61 -                       if (sn->rs_sample_rate_slower)
  62 +                       if (sn->rs_sample_rate_slower) {
  63                                 rc1 = sn->rs_sample_rate;
  64 -                       else
  65 +                               if (sn->sample_count > 0)
  66 +                                       sn->sample_count--;
  67 +                       } else
  68                                 rc1 = sn->max_tp_rate;
  69                 } else {
  70                         rc1 = sn->max_tp_rate2;
  71 @@ -552,6 +558,9 @@
  72                 if (tries <= tries1)
  73                         return;
  74
  75 +               if (bf->rcflags)
  76 +                       sn->sample_count++;
  77 +
  78                 if  (tries2 < 0)
  79                         return;
  80                 tries = tries - tries1;
  81 Index: madwifi-trunk-r3776/net80211/ieee80211_rate.h
  82 ===================================================================
  83 --- madwifi-trunk-r3776.orig/net80211/ieee80211_rate.h  2008-07-17 00:21:29.000000000 +0200
  84 +++ madwifi-trunk-r3776/net80211/ieee80211_rate.h       2008-07-17 02:37:41.000000000 +0200
  85 @@ -87,6 +87,7 @@
  86         int retries2;
  87         int rate3;
  88         int retries3;
  89 +       int privflags;
  90  };
  91
  92  struct ieee80211_rate_ops {