hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mac80211: improve minstrel_ht performance by reducing the impact of slow sampling 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20038 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2010-03-07 17:00:43 +00:00
parent 417f9b1fb4
commit e3062cbd6e
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package/mac80211/patches/560-minstrel_ht.patch
View File

@ -68,7 +68,7 @@
--- /dev/null --- /dev/null
+++ b/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -0,0 +1,800 @@ @@ -0,0 +1,807 @@
+/* +/*
+ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org> + * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
+ * + *
@ -262,6 +262,7 @@
+ int cur_prob, cur_prob_tp, cur_tp, cur_tp2; + int cur_prob, cur_prob_tp, cur_tp, cur_tp2;
+ int group, i, index; + int group, i, index;
+ +
+ mi->sample_slow = 0;
+ mi->sample_count = 0; + mi->sample_count = 0;
+ mi->max_tp_rate = 0; + mi->max_tp_rate = 0;
+ mi->max_tp_rate2 = 0; + mi->max_tp_rate2 = 0;
@ -542,7 +543,9 @@
+ if (!mr->retry_updated) + if (!mr->retry_updated)
+ minstrel_calc_retransmit(mp, mi, index); + minstrel_calc_retransmit(mp, mi, index);
+ +
+ if (rtscts) + if (mr->probability < MINSTREL_FRAC(20, 100))
+ rate->count = 2;
+ else if (rtscts)
+ rate->count = mr->retry_count_rtscts; + rate->count = mr->retry_count_rtscts;
+ else + else
+ rate->count = mr->retry_count; + rate->count = mr->retry_count;
@ -595,10 +598,14 @@
+ * if the link is working perfectly. + * if the link is working perfectly.
+ */ + */
+ if (minstrel_get_duration(sample_idx) > + if (minstrel_get_duration(sample_idx) >
+ minstrel_get_duration(mi->max_tp_rate) && + minstrel_get_duration(mi->max_tp_rate)) {
+ mr->sample_skipped < 10) + if (mr->sample_skipped < 10)
+ goto next; + goto next;
+ +
+ if (mi->sample_slow++ > 2)
+ goto next;
+ }
+
+ return sample_idx; + return sample_idx;
+ +
+next: +next:
@ -871,7 +878,7 @@
+} +}
--- /dev/null --- /dev/null
+++ b/net/mac80211/rc80211_minstrel_ht.h +++ b/net/mac80211/rc80211_minstrel_ht.h
@@ -0,0 +1,120 @@ @@ -0,0 +1,121 @@
+/* +/*
+ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org> + * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
+ * + *
@ -967,6 +974,7 @@
+ u8 sample_wait; + u8 sample_wait;
+ u8 sample_tries; + u8 sample_tries;
+ u8 sample_count; + u8 sample_count;
+ u8 sample_slow;
+ +
+ /* current MCS group to be sampled */ + /* current MCS group to be sampled */
+ u8 sample_group; + u8 sample_group;