aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_tunnel.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 /net/ipv6/ip6_tunnel.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 'net/ipv6/ip6_tunnel.c')
-rw-r--r--net/ipv6/ip6_tunnel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 8ad59f4811df..e1df691d78be 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -108,12 +108,12 @@ static struct net_device_stats *ip6_get_stats(struct net_device *dev)
108 per_cpu_ptr(dev->tstats, i); 108 per_cpu_ptr(dev->tstats, i);
109 109
110 do { 110 do {
111 start = u64_stats_fetch_begin_bh(&tstats->syncp); 111 start = u64_stats_fetch_begin_irq(&tstats->syncp);
112 tmp.rx_packets = tstats->rx_packets; 112 tmp.rx_packets = tstats->rx_packets;
113 tmp.rx_bytes = tstats->rx_bytes; 113 tmp.rx_bytes = tstats->rx_bytes;
114 tmp.tx_packets = tstats->tx_packets; 114 tmp.tx_packets = tstats->tx_packets;
115 tmp.tx_bytes = tstats->tx_bytes; 115 tmp.tx_bytes = tstats->tx_bytes;
116 } while (u64_stats_fetch_retry_bh(&tstats->syncp, start)); 116 } while (u64_stats_fetch_retry_irq(&tstats->syncp, start));
117 117
118 sum.rx_packets += tmp.rx_packets; 118 sum.rx_packets += tmp.rx_packets;
119 sum.rx_bytes += tmp.rx_bytes; 119 sum.rx_bytes += tmp.rx_bytes;