2008-07-19 01:50:46 +03:00
|
|
|
--- a/ath/if_ath.c
|
|
|
|
|
+++ b/ath/if_ath.c
|
|
|
|
|
@@ -8110,6 +8110,7 @@
|
2008-07-17 05:30:08 +03:00
|
|
|
ath_hal_setupxtxdesc(sc->sc_ah, ds, mrr.rate1, mrr.retries1,
|
|
|
|
|
mrr.rate2, mrr.retries2,
|
|
|
|
|
mrr.rate3, mrr.retries3);
|
|
|
|
|
+ bf->rcflags = mrr.privflags;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifndef ATH_SUPERG_FF
|
2008-07-19 01:50:46 +03:00
|
|
|
--- a/ath/if_athvar.h
|
|
|
|
|
+++ b/ath/if_athvar.h
|
2008-07-17 05:30:08 +03:00
|
|
|
@@ -454,6 +454,7 @@
|
|
|
|
|
u_int16_t bf_flags; /* tx descriptor flags */
|
|
|
|
|
u_int64_t bf_tsf;
|
|
|
|
|
int16_t bf_channoise;
|
|
|
|
|
+ unsigned int rcflags;
|
|
|
|
|
#ifdef ATH_SUPERG_FF
|
|
|
|
|
/* XXX: combine this with bf_skbaddr if it ever changes to accommodate
|
|
|
|
|
* multiple segments.
|
2008-07-19 01:50:46 +03:00
|
|
|
--- a/ath_rate/minstrel/minstrel.c
|
|
|
|
|
+++ b/ath_rate/minstrel/minstrel.c
|
2008-07-17 05:30:08 +03:00
|
|
|
@@ -341,18 +341,21 @@
|
|
|
|
|
if (sn->static_rate_ndx >= 0) {
|
|
|
|
|
ndx = sn->static_rate_ndx;
|
|
|
|
|
} else {
|
|
|
|
|
+ int delta;
|
|
|
|
|
+
|
|
|
|
|
sn->packet_count++;
|
|
|
|
|
sn->random_n = (sn->a * sn->random_n) + sn->b;
|
|
|
|
|
offset = sn->random_n & 0xf;
|
|
|
|
|
|
|
|
|
|
- if ((((100 * sn->sample_count) / sn->packet_count) <
|
|
|
|
|
- ath_lookaround_rate) &&
|
|
|
|
|
- (offset < 2)) {
|
|
|
|
|
+ delta = (sn->packet_count * ath_lookaround_rate / 100) - sn->sample_count;
|
|
|
|
|
+ if ((delta > 0) && (offset < 2)) {
|
|
|
|
|
sn->sample_count++;
|
|
|
|
|
sn->is_sampling = 1;
|
|
|
|
|
if (sn->packet_count >= 10000) {
|
|
|
|
|
sn->sample_count = 0;
|
|
|
|
|
sn->packet_count = 0;
|
|
|
|
|
+ } else if (delta > sn->num_rates * 2) {
|
|
|
|
|
+ sn->sample_count += ((delta - sn->num_rates * 2) * ath_lookaround_rate) / 100;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Don't look for slowest rate (i.e. slowest
|
|
|
|
|
@@ -420,11 +423,14 @@
|
|
|
|
|
if (sn->num_rates <= 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
+ mrr->privflags = sn->is_sampling;
|
|
|
|
|
if (sn->is_sampling) {
|
|
|
|
|
sn->is_sampling = 0;
|
|
|
|
|
- if (sn->rs_sample_rate_slower)
|
|
|
|
|
+ if (sn->rs_sample_rate_slower) {
|
|
|
|
|
rc1 = sn->rs_sample_rate;
|
|
|
|
|
- else
|
|
|
|
|
+ if (sn->sample_count > 0)
|
|
|
|
|
+ sn->sample_count--;
|
|
|
|
|
+ } else
|
|
|
|
|
rc1 = sn->max_tp_rate;
|
|
|
|
|
} else {
|
|
|
|
|
rc1 = sn->max_tp_rate2;
|
|
|
|
|
@@ -552,6 +558,9 @@
|
|
|
|
|
if (tries <= tries1)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
+ if (bf->rcflags)
|
|
|
|
|
+ sn->sample_count++;
|
|
|
|
|
+
|
|
|
|
|
if (tries2 < 0)
|
|
|
|
|
return;
|
|
|
|
|
tries = tries - tries1;
|
2008-07-19 01:50:46 +03:00
|
|
|
--- a/net80211/ieee80211_rate.h
|
|
|
|
|
+++ b/net80211/ieee80211_rate.h
|
2008-07-17 05:30:08 +03:00
|
|
|
@@ -87,6 +87,7 @@
|
|
|
|
|
int retries2;
|
|
|
|
|
int rate3;
|
|
|
|
|
int retries3;
|
|
|
|
|
+ int privflags;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct ieee80211_rate_ops {
|
