projects
/
wrapfs-5.3.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
24a0bbf
)
net: bridge: add missing counters to ndo_get_stats64 callback
author
Heiner Kallweit
<hkallweit1@gmail.com>
Fri, 13 Nov 2020 09:27:27 +0000
(10:27 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Tue, 24 Nov 2020 12:05:38 +0000
(13:05 +0100)
[ Upstream commit
7a30ecc9237681bb125cbd30eee92bef7e86293d
]
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>
Link:
https://lore.kernel.org/r/58ea9963-77ad-a7cf-8dfd-fc95ab95f606@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/bridge/br_device.c
patch
|
blob
|
history
diff --git
a/net/bridge/br_device.c
b/net/bridge/br_device.c
index b7cc322acdc8801c817835507fd28a76a0580538..65cd4c8aca537ed4af605f2c8802786a6d6f7606 100644
(file)
--- a/
net/bridge/br_device.c
+++ b/
net/bridge/br_device.c
@@
-186,6
+186,7
@@
static void br_get_stats64(struct net_device *dev,
sum.rx_packets += tmp.rx_packets;
}
+ netdev_stats_to_stats64(stats, &dev->stats);
stats->tx_bytes = sum.tx_bytes;
stats->tx_packets = sum.tx_packets;
stats->rx_bytes = sum.rx_bytes;