| Message ID | 58ea9963-77ad-a7cf-8dfd-fc95ab95f606@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: bridge: add missing counters to ndo_get_stats64 callback | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 7 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On Fri, 13 Nov 2020 10:27:27 +0100 Heiner Kallweit wrote: > In br_forward.c and br_input.c fields dev->stats.tx_dropped and > dev->stats.multicast are populated, but they are ignored in > ndo_get_stats64. > > Fixes: 28172739f0a2 ("net: fix 64 bit counters on 32 bit arches") > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- > Patch will not apply cleanly on kernel versions that don't have > dev_fetch_sw_netstats() yet. Looks straightforward enough, I'll backport manually. Applied, thanks!
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 387403931..77bcc8487 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -207,6 +207,7 @@ static void br_get_stats64(struct net_device *dev, { struct net_bridge *br = netdev_priv(dev); + netdev_stats_to_stats64(stats, &dev->stats); dev_fetch_sw_netstats(stats, br->stats); }
In br_forward.c and br_input.c fields dev->stats.tx_dropped and dev->stats.multicast are populated, but they are ignored in ndo_get_stats64. Fixes: 28172739f0a2 ("net: fix 64 bit counters on 32 bit arches") Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- Patch will not apply cleanly on kernel versions that don't have dev_fetch_sw_netstats() yet. --- net/bridge/br_device.c | 1 + 1 file changed, 1 insertion(+)