aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/via/via-rhine.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2014-03-14 00:26:42 -0400
committerDavid S. Miller <davem@davemloft.net>2014-03-14 22:41:36 -0400
commit57a7744e09867ebcfa0ccf1d6d529caa7728d552 (patch)
tree6407fee7138787a24bf9251abfeeae69a239028a /drivers/net/ethernet/via/via-rhine.c
parent85dcce7a73f1cc59f7a96fe52713b1630f4ca272 (diff)
net: Replace u64_stats_fetch_begin_bh to u64_stats_fetch_begin_irq
Replace the bh safe variant with the hard irq safe variant. We need a hard irq safe variant to deal with netpoll transmitting packets from hard irq context, and we need it in most if not all of the places using the bh safe variant. Except on 32bit uni-processor the code is exactly the same so don't bother with a bh variant, just have a hard irq safe variant that everyone can use. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/via/via-rhine.c')
-rw-r--r--drivers/net/ethernet/via/via-rhine.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index ef312bc6b865..5bc1a2d02dc1 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -2070,16 +2070,16 @@ rhine_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
2070 netdev_stats_to_stats64(stats, &dev->stats); 2070 netdev_stats_to_stats64(stats, &dev->stats);
2071 2071
2072 do { 2072 do {
2073 start = u64_stats_fetch_begin_bh(&rp->rx_stats.syncp); 2073 start = u64_stats_fetch_begin_irq(&rp->rx_stats.syncp);
2074 stats->rx_packets = rp->rx_stats.packets; 2074 stats->rx_packets = rp->rx_stats.packets;
2075 stats->rx_bytes = rp->rx_stats.bytes; 2075 stats->rx_bytes = rp->rx_stats.bytes;
2076 } while (u64_stats_fetch_retry_bh(&rp->rx_stats.syncp, start)); 2076 } while (u64_stats_fetch_retry_irq(&rp->rx_stats.syncp, start));
2077 2077
2078 do { 2078 do {
2079 start = u64_stats_fetch_begin_bh(&rp->tx_stats.syncp); 2079 start = u64_stats_fetch_begin_irq(&rp->tx_stats.syncp);
2080 stats->tx_packets = rp->tx_stats.packets; 2080 stats->tx_packets = rp->tx_stats.packets;
2081 stats->tx_bytes = rp->tx_stats.bytes; 2081 stats->tx_bytes = rp->tx_stats.bytes;
2082 } while (u64_stats_fetch_retry_bh(&rp->tx_stats.syncp, start)); 2082 } while (u64_stats_fetch_retry_irq(&rp->tx_stats.syncp, start));
2083 2083
2084 return stats; 2084 return stats;
2085} 2085}