aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ifb.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/ifb.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/ifb.c')
-rw-r--r--drivers/net/ifb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index c14d39bf32d0..1da36764b1a4 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -136,18 +136,18 @@ static struct rtnl_link_stats64 *ifb_stats64(struct net_device *dev,
136 unsigned int start; 136 unsigned int start;
137 137
138 do { 138 do {
139 start = u64_stats_fetch_begin_bh(&dp->rsync); 139 start = u64_stats_fetch_begin_irq(&dp->rsync);
140 stats->rx_packets = dp->rx_packets; 140 stats->rx_packets = dp->rx_packets;
141 stats->rx_bytes = dp->rx_bytes; 141 stats->rx_bytes = dp->rx_bytes;
142 } while (u64_stats_fetch_retry_bh(&dp->rsync, start)); 142 } while (u64_stats_fetch_retry_irq(&dp->rsync, start));
143 143
144 do { 144 do {
145 start = u64_stats_fetch_begin_bh(&dp->tsync); 145 start = u64_stats_fetch_begin_irq(&dp->tsync);
146 146
147 stats->tx_packets = dp->tx_packets; 147 stats->tx_packets = dp->tx_packets;
148 stats->tx_bytes = dp->tx_bytes; 148 stats->tx_bytes = dp->tx_bytes;
149 149
150 } while (u64_stats_fetch_retry_bh(&dp->tsync, start)); 150 } while (u64_stats_fetch_retry_irq(&dp->tsync, start));
151 151
152 stats->rx_dropped = dev->stats.rx_dropped; 152 stats->rx_dropped = dev->stats.rx_dropped;
153 stats->tx_dropped = dev->stats.tx_dropped; 153 stats->tx_dropped = dev->stats.tx_dropped;