summaryrefslogtreecommitdiffstats
path: root/drivers/net/macvlan.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/macvlan.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/macvlan.c')
-rw-r--r--drivers/net/macvlan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index c683ac2c8c94..753a8c23d15d 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -582,13 +582,13 @@ static struct rtnl_link_stats64 *macvlan_dev_get_stats64(struct net_device *dev,
582 for_each_possible_cpu(i) { 582 for_each_possible_cpu(i) {
583 p = per_cpu_ptr(vlan->pcpu_stats, i); 583 p = per_cpu_ptr(vlan->pcpu_stats, i);
584 do { 584 do {
585 start = u64_stats_fetch_begin_bh(&p->syncp); 585 start = u64_stats_fetch_begin_irq(&p->syncp);
586 rx_packets = p->rx_packets; 586 rx_packets = p->rx_packets;
587 rx_bytes = p->rx_bytes; 587 rx_bytes = p->rx_bytes;
588 rx_multicast = p->rx_multicast; 588 rx_multicast = p->rx_multicast;
589 tx_packets = p->tx_packets; 589 tx_packets = p->tx_packets;
590 tx_bytes = p->tx_bytes; 590 tx_bytes = p->tx_bytes;
591 } while (u64_stats_fetch_retry_bh(&p->syncp, start)); 591 } while (u64_stats_fetch_retry_irq(&p->syncp, start));
592 592
593 stats->rx_packets += rx_packets; 593 stats->rx_packets += rx_packets;
594 stats->rx_bytes += rx_bytes; 594 stats->rx_bytes += rx_bytes;