]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
mac80211: consider per-CPU statistics if present
authorJohannes Berg <johannes.berg@intel.com>
Thu, 10 Jun 2021 20:08:16 +0000 (22:08 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Jul 2021 08:01:07 +0000 (10:01 +0200)
commit527a2347c28a344f6b4b4633b386a8193519438a
treea30b6ccd39e8ad0ea1e7826e77f6b0bfa3039b99
parentccedf8163fa66f2db85d863a43f056ac69a5fef5
mac80211: consider per-CPU statistics if present

[ Upstream commit d656a4c6ead6c3f252b2f2532bc9735598f7e317 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/mac80211/sta_info.c