From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 1 Jun 2017 19:26:03 +0000 (+0200)
Subject: mac80211: fix dropped counter in multiqueue RX
X-Git-Tag: v4.12-rc5~33^2~32^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e165bc02a02c70e40d5c811c705ba269aeca0497;p=thirdparty%2Flinux.git

mac80211: fix dropped counter in multiqueue RX

In the commit enabling per-CPU station statistics, I inadvertedly
copy-pasted some code to update rx_packets and forgot to change it
to update rx_dropped_misc. Fix that.

This addresses https://bugzilla.kernel.org/show_bug.cgi?id=195953.

Fixes: c9c5962b56c1 ("mac80211: enable collecting station statistics per-CPU")
Reported-by: Petru-Florin Mihancea <petrum@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 7cdf7a835bb01..403e3cc58b573 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -2155,7 +2155,7 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
 			struct ieee80211_sta_rx_stats *cpurxs;
 
 			cpurxs = per_cpu_ptr(sta->pcpu_rx_stats, cpu);
-			sinfo->rx_packets += cpurxs->dropped;
+			sinfo->rx_dropped_misc += cpurxs->dropped;
 		}
 	}