mirror of
https://github.com/torvalds/linux.git
synced 2024-12-11 21:52:04 +00:00
d4d141cae8
Since 5935839ad7
("mac80211: improve minstrel_ht rate sorting by
throughput & probability"), the rate indexes are manipulated via u8's
and hence allow for a maximum of 256 mcs_group entries in
minstrel_mcs_groups.
ATM, minstrel_ht advertizes support up to 3HTSS@40MHz, consuming:
8(MCS_GROUP_RATES) * (3(SS)*2(GI)*2(BW)+1(CCK)), i.e. 104 entries.
Support for 3VHTSS@80MHz will require:
10(MCS_GROUP_RATES) * (3(SS)*2(GI)*2(BW)+1(CCK)) +
10(MCS_GROUP_RATES) * (3(SS)*2(GI)*3(BW)), i.e. 130 + 180 entries.
This change moves from u8s to u16s where necessary.
Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
Cc: 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*/
|
|
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_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
|