5935839ad7
This patch improves the way minstrel_ht sorts rates according to throughput and success probability. 3 FOR-loops across the entire rate and mcs group set in function minstrel_ht_update_stats() which where used to determine the fastest, second fastest and most robust rate are reduced to 2 FOR-loop. The sorted list of rates according throughput is extended to the best four rates as we need them in upcoming joint rate and power control. The sorting is done via the new function minstrel_ht_sort_best_tp_rates(). The annotation of those 4 best throughput rates in the debugfs file rc-stats is changes to: "A,B,C,D", where A is the fastest rate and C the 4th fastest. Signed-off-by: Thomas Huehn <thomas@net.t-labs.tu-berlin.de> Tested-by: Stefan Venz <ikstream86@gmail.com> Acked-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
103 lines
2.2 KiB
C
103 lines
2.2 KiB
C
/*
|
|
* Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#ifndef __RC_MINSTREL_HT_H
|
|
#define __RC_MINSTREL_HT_H
|
|
|
|
/*
|
|
* The number of streams can be changed to 2 to reduce code
|
|
* size and memory footprint.
|
|
*/
|
|
#define MINSTREL_MAX_STREAMS 3
|
|
#define MINSTREL_STREAM_GROUPS 4
|
|
|
|
#define MCS_GROUP_RATES 8
|
|
|
|
struct mcs_group {
|
|
u32 flags;
|
|
unsigned int streams;
|
|
unsigned int duration[MCS_GROUP_RATES];
|
|
};
|
|
|
|
extern const struct mcs_group minstrel_mcs_groups[];
|
|
|
|
struct minstrel_mcs_group_data {
|
|
u8 index;
|
|
u8 column;
|
|
|
|
/* bitfield of supported MCS rates of this group */
|
|
u8 supported;
|
|
|
|
/* sorted rate set within a MCS group*/
|
|
u8 max_group_tp_rate[MAX_THR_RATES];
|
|
u8 max_group_prob_rate;
|
|
|
|
/* MCS rate statistics */
|
|
struct minstrel_rate_stats rates[MCS_GROUP_RATES];
|
|
};
|
|
|
|
struct minstrel_ht_sta {
|
|
struct ieee80211_sta *sta;
|
|
|
|
/* ampdu length (average, per sampling interval) */
|
|
unsigned int ampdu_len;
|
|
unsigned int ampdu_packets;
|
|
|
|
/* ampdu length (EWMA) */
|
|
unsigned int avg_ampdu_len;
|
|
|
|
/* overall sorted rate set */
|
|
u8 max_tp_rate[MAX_THR_RATES];
|
|
u8 max_prob_rate;
|
|
|
|
/* time of last status update */
|
|
unsigned long stats_update;
|
|
|
|
/* overhead time in usec for each frame */
|
|
unsigned int overhead;
|
|
unsigned int overhead_rtscts;
|
|
|
|
unsigned int total_packets;
|
|
unsigned int sample_packets;
|
|
|
|
/* tx flags to add for frames for this sta */
|
|
u32 tx_flags;
|
|
|
|
u8 sample_wait;
|
|
u8 sample_tries;
|
|
u8 sample_count;
|
|
u8 sample_slow;
|
|
|
|
/* current MCS group to be sampled */
|
|
u8 sample_group;
|
|
|
|
u8 cck_supported;
|
|
u8 cck_supported_short;
|
|
|
|
/* MCS rate group info and statistics */
|
|
struct minstrel_mcs_group_data groups[MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS + 1];
|
|
};
|
|
|
|
struct minstrel_ht_sta_priv {
|
|
union {
|
|
struct minstrel_ht_sta ht;
|
|
struct minstrel_sta_info legacy;
|
|
};
|
|
#ifdef CONFIG_MAC80211_DEBUGFS
|
|
struct dentry *dbg_stats;
|
|
#endif
|
|
void *ratelist;
|
|
void *sample_table;
|
|
bool is_ht;
|
|
};
|
|
|
|
void minstrel_ht_add_sta_debugfs(void *priv, void *priv_sta, struct dentry *dir);
|
|
void minstrel_ht_remove_sta_debugfs(void *priv, void *priv_sta);
|
|
|
|
#endif
|