From: david decotigny Date: Thu, 17 Nov 2011 09:38:23 +0000 (+0000) Subject: net-forcedeth: fix possible stats inaccuracies on 32b hosts X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=505a467b66233fd08ac32fca943100130928bf89;p=openwrt%2Fstaging%2Fblogic.git net-forcedeth: fix possible stats inaccuracies on 32b hosts The software stats are updated from BH, this change ensures that 32b UP hosts use appropriate protection. Tested: - HW/SW stats consistent with pktgen (in particular tx=rx) - HW/SW stats consistent when tx/rx offloads disabled - no problem with+without lockdep (SMP 16-way) Signed-off-by: David Decotigny Acked-by: Eric Dumazet Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index 0d8d5c0ab336..49905347e0b2 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c @@ -1756,19 +1756,19 @@ nv_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *storage) /* software stats */ do { - syncp_start = u64_stats_fetch_begin(&np->swstats_rx_syncp); + syncp_start = u64_stats_fetch_begin_bh(&np->swstats_rx_syncp); storage->rx_packets = np->stat_rx_packets; storage->rx_bytes = np->stat_rx_bytes; storage->rx_dropped = np->stat_rx_dropped; storage->rx_missed_errors = np->stat_rx_missed_errors; - } while (u64_stats_fetch_retry(&np->swstats_rx_syncp, syncp_start)); + } while (u64_stats_fetch_retry_bh(&np->swstats_rx_syncp, syncp_start)); do { - syncp_start = u64_stats_fetch_begin(&np->swstats_tx_syncp); + syncp_start = u64_stats_fetch_begin_bh(&np->swstats_tx_syncp); storage->tx_packets = np->stat_tx_packets; storage->tx_bytes = np->stat_tx_bytes; storage->tx_dropped = np->stat_tx_dropped; - } while (u64_stats_fetch_retry(&np->swstats_tx_syncp, syncp_start)); + } while (u64_stats_fetch_retry_bh(&np->swstats_tx_syncp, syncp_start)); /* If the nic supports hw counters then retrieve latest values */ if (np->driver_data & DEV_HAS_STATISTICS_V123) {