From: David S. Miller Date: Mon, 1 Apr 2019 21:50:14 +0000 (-0700) Subject: Merge branch 'net-sched-fix-stats-accounting-for-child-NOLOCK-qdiscs' X-Git-Tag: v5.1-rc4~19^2~19 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c4df1bddc4306a08bc8ec6a65d34386388d2f42f;p=users%2Fwilly%2Flinux.git Merge branch 'net-sched-fix-stats-accounting-for-child-NOLOCK-qdiscs' Paolo Abeni says: ==================== net: sched: fix stats accounting for child NOLOCK qdiscs Currently, stats accounting for NOLOCK qdisc enslaved to classful (lock) qdiscs is buggy. Per CPU values are ignored in most places, as a result, stats dump in the above scenario always report 0 length backlog and parent backlog len is not updated correctly on NOLOCK qdisc removal. The first patch address stats dumping, and the second one child qdisc removal. I'm targeting the net tree as this is a bugfix, but it could be moved to net-next due to the relatively large diffstat. ==================== Signed-off-by: David S. Miller --- c4df1bddc4306a08bc8ec6a65d34386388d2f42f