diff options
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/306-mac80211-minstrel-reduce-minstrel_mcs_groups-size.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/subsys/306-mac80211-minstrel-reduce-minstrel_mcs_groups-size.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/kernel/mac80211/patches/subsys/306-mac80211-minstrel-reduce-minstrel_mcs_groups-size.patch b/package/kernel/mac80211/patches/subsys/306-mac80211-minstrel-reduce-minstrel_mcs_groups-size.patch index 02a0ca0a52..019fb77d18 100644 --- a/package/kernel/mac80211/patches/subsys/306-mac80211-minstrel-reduce-minstrel_mcs_groups-size.patch +++ b/package/kernel/mac80211/patches/subsys/306-mac80211-minstrel-reduce-minstrel_mcs_groups-size.patch @@ -118,7 +118,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> -#define CCK_GROUP \ +#define CCK_GROUP(_s) \ [MINSTREL_CCK_GROUP] = { \ - .streams = 0, \ + .streams = 1, \ .flags = 0, \ + .shift = _s, \ .duration = { \ @@ -218,7 +218,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> }; static u8 sample_table[SAMPLE_COLUMNS][MCS_GROUP_RATES] __read_mostly; -@@ -307,7 +310,8 @@ minstrel_ht_get_tp_avg(struct minstrel_h +@@ -308,7 +311,8 @@ minstrel_ht_get_tp_avg(struct minstrel_h if (group != MINSTREL_CCK_GROUP) nsecs = 1000 * mi->overhead / MINSTREL_TRUNC(mi->avg_ampdu_len); @@ -228,7 +228,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /* * For the throughput calculation, limit the probability value to 90% to -@@ -755,12 +759,19 @@ minstrel_ht_tx_status(void *priv, struct +@@ -756,12 +760,19 @@ minstrel_ht_tx_status(void *priv, struct minstrel_ht_update_rates(mp, mi); } @@ -249,7 +249,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> unsigned int tx_time, tx_time_rtscts, tx_time_data; unsigned int cw = mp->cw_min; unsigned int ctime = 0; -@@ -779,8 +790,7 @@ minstrel_calc_retransmit(struct minstrel +@@ -780,8 +791,7 @@ minstrel_calc_retransmit(struct minstrel mrs->retry_count_rtscts = 2; mrs->retry_updated = true; @@ -259,7 +259,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /* Contention time for first 2 tries */ ctime = (t_slot * cw) >> 1; -@@ -874,20 +884,24 @@ minstrel_ht_get_max_amsdu_len(struct min +@@ -875,20 +885,24 @@ minstrel_ht_get_max_amsdu_len(struct min int group = mi->max_prob_rate / MCS_GROUP_RATES; const struct mcs_group *g = &minstrel_mcs_groups[group]; int rate = mi->max_prob_rate % MCS_GROUP_RATES; @@ -286,7 +286,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> return 1600; /* -@@ -895,7 +909,7 @@ minstrel_ht_get_max_amsdu_len(struct min +@@ -896,7 +910,7 @@ minstrel_ht_get_max_amsdu_len(struct min * rate success probability is less than 75%, limit A-MSDU to twice the usual * data packet size */ @@ -295,7 +295,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> (minstrel_ht_get_prob_ewma(mi, mi->max_tp_rate[0]) < MINSTREL_FRAC(75, 100))) return 3200; -@@ -942,13 +956,6 @@ minstrel_ht_update_rates(struct minstrel +@@ -943,13 +957,6 @@ minstrel_ht_update_rates(struct minstrel rate_control_set_rates(mp->hw, mi->sta, rates); } |