mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 21:54:06 +08:00
mac80211: consider per-CPU statistics if present
If we have been keeping per-CPU statistics, consider them regardless of USES_RSS, because we may not actually fill those, for example in non-fast-RX cases when the connection is not compatible with fast-RX. If we didn't fill them, the additional data will be zero and not affect anything, and if we did fill them then it's more correct to consider them. This fixes an issue in mesh mode where some statistics are not updated due to USES_RSS being set, but fast-RX isn't used. Reported-by: Thiraviyam Mariyappan <tmariyap@codeaurora.org> Link: https://lore.kernel.org/r/20210610220814.13b35f5797c5.I511e9b33c5694e0d6cef4b6ae755c873d7c22124@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
9df66d5b9f
commit
d656a4c6ea
@ -2093,10 +2093,9 @@ static struct ieee80211_sta_rx_stats *
|
||||
sta_get_last_rx_stats(struct sta_info *sta)
|
||||
{
|
||||
struct ieee80211_sta_rx_stats *stats = &sta->rx_stats;
|
||||
struct ieee80211_local *local = sta->local;
|
||||
int cpu;
|
||||
|
||||
if (!ieee80211_hw_check(&local->hw, USES_RSS))
|
||||
if (!sta->pcpu_rx_stats)
|
||||
return stats;
|
||||
|
||||
for_each_possible_cpu(cpu) {
|
||||
@ -2196,9 +2195,7 @@ static void sta_set_tidstats(struct sta_info *sta,
|
||||
int cpu;
|
||||
|
||||
if (!(tidstats->filled & BIT(NL80211_TID_STATS_RX_MSDU))) {
|
||||
if (!ieee80211_hw_check(&local->hw, USES_RSS))
|
||||
tidstats->rx_msdu +=
|
||||
sta_get_tidstats_msdu(&sta->rx_stats, tid);
|
||||
tidstats->rx_msdu += sta_get_tidstats_msdu(&sta->rx_stats, tid);
|
||||
|
||||
if (sta->pcpu_rx_stats) {
|
||||
for_each_possible_cpu(cpu) {
|
||||
@ -2277,7 +2274,6 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,
|
||||
sinfo->rx_beacon = sdata->u.mgd.count_beacon_signal;
|
||||
|
||||
drv_sta_statistics(local, sdata, &sta->sta, sinfo);
|
||||
|
||||
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_INACTIVE_TIME) |
|
||||
BIT_ULL(NL80211_STA_INFO_STA_FLAGS) |
|
||||
BIT_ULL(NL80211_STA_INFO_BSS_PARAM) |
|
||||
@ -2312,8 +2308,7 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,
|
||||
|
||||
if (!(sinfo->filled & (BIT_ULL(NL80211_STA_INFO_RX_BYTES64) |
|
||||
BIT_ULL(NL80211_STA_INFO_RX_BYTES)))) {
|
||||
if (!ieee80211_hw_check(&local->hw, USES_RSS))
|
||||
sinfo->rx_bytes += sta_get_stats_bytes(&sta->rx_stats);
|
||||
sinfo->rx_bytes += sta_get_stats_bytes(&sta->rx_stats);
|
||||
|
||||
if (sta->pcpu_rx_stats) {
|
||||
for_each_possible_cpu(cpu) {
|
||||
|
Loading…
Reference in New Issue
Block a user