mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-11-19 06:54:58 +01:00
mac80211: improve minstrel_ht performance by reducing the impact of slow sampling
SVN-Revision: 20038
This commit is contained in:
parent
d238ba2541
commit
e7c6e9d603
@ -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,9 +598,13 @@
|
|||||||
+ * 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;
|
||||||
+
|
+
|
||||||
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user