9208247d74
When the new CONFIG_MAC80211_RC_MINSTREL_VHT is not set (default 'N'), there is no behavioral change including in sampling and MCS_GROUP_RATES remains 8. Otherwise MCS_GROUP_RATES is 10, and a module parameter *vht_only* (default 'true'), restricts the rates selection to VHT when VHT is supported. Regarding the debugfs stats buffer: It is explicitly increased from 8k to 32k to fit every rates incl. when both HT and VHT rates are enabled, as for the format, before: type rate tpt eprob *prob ret *ok(*cum) ok( cum) HT20/LGI ABCDP MCS0 0.0 0.0 0.0 1 0( 0) 0( 0) after: type rate tpt eprob *prob ret *ok(*cum) ok( cum) HT20/LGI ABCDP MCS0 0.0 0.0 0.0 1 0( 0) 0( 0) VHT40/LGI MCS5/2 0.0 0.0 0.0 0 0( 0) 0( 0) Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com> Cc: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
125 lines
2.9 KiB
C
125 lines
2.9 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_HT_STREAM_GROUPS 4 /* BW(=2) * SGI(=2) */
|
|
#ifdef CONFIG_MAC80211_RC_MINSTREL_VHT
|
|
#define MINSTREL_VHT_STREAM_GROUPS 6 /* BW(=3) * SGI(=2) */
|
|
#else
|
|
#define MINSTREL_VHT_STREAM_GROUPS 0
|
|
#endif
|
|
|
|
#define MINSTREL_HT_GROUPS_NB (MINSTREL_MAX_STREAMS * \
|
|
MINSTREL_HT_STREAM_GROUPS)
|
|
#define MINSTREL_VHT_GROUPS_NB (MINSTREL_MAX_STREAMS * \
|
|
MINSTREL_VHT_STREAM_GROUPS)
|
|
#define MINSTREL_CCK_GROUPS_NB 1
|
|
#define MINSTREL_GROUPS_NB (MINSTREL_HT_GROUPS_NB + \
|
|
MINSTREL_VHT_GROUPS_NB + \
|
|
MINSTREL_CCK_GROUPS_NB)
|
|
|
|
#define MINSTREL_HT_GROUP_0 0
|
|
#define MINSTREL_CCK_GROUP (MINSTREL_HT_GROUP_0 + MINSTREL_HT_GROUPS_NB)
|
|
#define MINSTREL_VHT_GROUP_0 (MINSTREL_CCK_GROUP + 1)
|
|
|
|
#ifdef CONFIG_MAC80211_RC_MINSTREL_VHT
|
|
#define MCS_GROUP_RATES 10
|
|
#else
|
|
#define MCS_GROUP_RATES 8
|
|
#endif
|
|
|
|
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 */
|
|
u16 supported;
|
|
|
|
/* sorted rate set within a MCS group*/
|
|
u16 max_group_tp_rate[MAX_THR_RATES];
|
|
u16 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 */
|
|
u16 max_tp_rate[MAX_THR_RATES];
|
|
u16 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_GROUPS_NB];
|
|
};
|
|
|
|
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
|