Skip to contentSkip to conversation

Patch "mac80211: fix dropped counter in multiqueue RX" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jun 18, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

mac80211: fix dropped counter in multiqueue RX

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mac80211-fix-dropped-counter-in-multiqueue-rx.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From e165bc02a02c70e40d5c811c705ba269aeca0497 Mon Sep 17 00:00:00 2001

From: Johannes Berg <[email protected]>
Date: Thu, 1 Jun 2017 21:26:03 +0200
Subject: mac80211: fix dropped counter in multiqueue RX

From: Johannes Berg <[email protected]>

commit e165bc02a02c70e40d5c811c705ba269aeca0497 upstream.

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")
---
 net/mac80211/sta_info.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/sta_info.c +1 -1
@@ -2148,7 +2148,7 @@ void sta_set_sinfo(struct sta_info *sta,
 			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;
 		}
 	}
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/mac80211-strictly-check-mesh-address-extension-mode.patch queue-4.9/mac80211-wpa-use-constant-time-memory-comparison-for-macs.patch queue-4.9/mac80211-don-t-send-smps-action-frame-in-ap-mode-when-not-needed.patch queue-4.9/mac80211-fix-ibss-presp-allocation-size.patch queue-4.9/mac80211-fix-csa-in-ibss-mode.patch queue-4.9/mac80211-don-t-look-at-the-pm-bit-of-bar-frames.patch queue-4.9/mac80211-fix-packet-statistics-for-fast-rx.patch queue-4.9/mac80211-fix-dropped-counter-in-multiqueue-rx.patch