aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/br_device.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/bridge/br_device.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/bridge/br_device.c')
-rw-r--r--net/bridge/br_device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index b063050b63e2..f2a08477e0f5 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -136,9 +136,9 @@ static struct rtnl_link_stats64 *br_get_stats64(struct net_device *dev,
136 const struct pcpu_sw_netstats *bstats 136 const struct pcpu_sw_netstats *bstats
137 = per_cpu_ptr(br->stats, cpu); 137 = per_cpu_ptr(br->stats, cpu);
138 do { 138 do {
139 start = u64_stats_fetch_begin_bh(&bstats->syncp); 139 start = u64_stats_fetch_begin_irq(&bstats->syncp);
140 memcpy(&tmp, bstats, sizeof(tmp)); 140 memcpy(&tmp, bstats, sizeof(tmp));
141 } while (u64_stats_fetch_retry_bh(&bstats->syncp, start)); 141 } while (u64_stats_fetch_retry_irq(&bstats->syncp, start));
142 sum.tx_bytes += tmp.tx_bytes; 142 sum.tx_bytes += tmp.tx_bytes;
143 sum.tx_packets += tmp.tx_packets; 143 sum.tx_packets += tmp.tx_packets;
144 sum.rx_bytes += tmp.rx_bytes; 144 sum.rx_bytes += tmp.rx_bytes;