projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: fix race condition in several drivers when reading stats
[deliverable/linux.git]
/
drivers
/
net
/
ethernet
/
neterion
/
vxge
/
vxge-main.c
diff --git
a/drivers/net/ethernet/neterion/vxge/vxge-main.c
b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index 4e20c5f02712bafba1a77a8d6e0e2a6d0f1e5d6c..de219044351063b1a9e2e400d4a823357c050b32 100644
(file)
--- a/
drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/
drivers/net/ethernet/neterion/vxge/vxge-main.c
@@
-3131,12
+3131,12
@@
vxge_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *net_stats)
u64 packets, bytes, multicast;
do {
u64 packets, bytes, multicast;
do {
- start = u64_stats_fetch_begin(&rxstats->syncp);
+ start = u64_stats_fetch_begin
_bh
(&rxstats->syncp);
packets = rxstats->rx_frms;
multicast = rxstats->rx_mcast;
bytes = rxstats->rx_bytes;
packets = rxstats->rx_frms;
multicast = rxstats->rx_mcast;
bytes = rxstats->rx_bytes;
- } while (u64_stats_fetch_retry(&rxstats->syncp, start));
+ } while (u64_stats_fetch_retry
_bh
(&rxstats->syncp, start));
net_stats->rx_packets += packets;
net_stats->rx_bytes += bytes;
net_stats->rx_packets += packets;
net_stats->rx_bytes += bytes;
@@
-3146,11
+3146,11
@@
vxge_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *net_stats)
net_stats->rx_dropped += rxstats->rx_dropped;
do {
net_stats->rx_dropped += rxstats->rx_dropped;
do {
- start = u64_stats_fetch_begin(&txstats->syncp);
+ start = u64_stats_fetch_begin
_bh
(&txstats->syncp);
packets = txstats->tx_frms;
bytes = txstats->tx_bytes;
packets = txstats->tx_frms;
bytes = txstats->tx_bytes;
- } while (u64_stats_fetch_retry(&txstats->syncp, start));
+ } while (u64_stats_fetch_retry
_bh
(&txstats->syncp, start));
net_stats->tx_packets += packets;
net_stats->tx_bytes += bytes;
net_stats->tx_packets += packets;
net_stats->tx_bytes += bytes;
This page took
0.025232 seconds
and
5
git commands to generate.