From: David S. Miller Date: Fri, 27 Mar 2020 02:20:37 +0000 (-0700) Subject: Merge branch 'Implement-stats_update-callback-for-pedit-and-skbedit' X-Git-Tag: v5.7-rc1~146^2~70 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=adde556552dd514de99beba72c3b23d70a657e56;p=users%2Fwilly%2Fxarray.git Merge branch 'Implement-stats_update-callback-for-pedit-and-skbedit' Petr Machata says: ==================== Implement stats_update callback for pedit and skbedit The stats_update callback is used for adding HW counters to the SW ones. Both skbedit and pedit actions are actually recognized by flow_offload.h, but do not implement these callbacks. As a consequence, the reported values are only the SW ones, even where there is a HW counter available. Patch #1 adds the callback to action skbedit, patch #2 adds it to action pedit. Patch #3 tweaks an skbedit selftest with a check that would have caught this problem. The pedit test is not likewise tweaked, because the iproute2 pedit action currently does not support JSON dumping. This will be addressed later. ==================== Signed-off-by: David S. Miller --- adde556552dd514de99beba72c3b23d70a657e56