diff options
-rw-r--r-- | drivers/net/dummy.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-main.c | 8 | ||||
-rw-r--r-- | drivers/net/loopback.c | 4 | ||||
-rw-r--r-- | drivers/net/virtio_net.c | 8 | ||||
-rw-r--r-- | net/bridge/br_device.c | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c index 9d6a0677466b..c260af5411d0 100644 --- a/drivers/net/dummy.c +++ b/drivers/net/dummy.c | |||
@@ -63,10 +63,10 @@ static struct rtnl_link_stats64 *dummy_get_stats64(struct net_device *dev, | |||
63 | 63 | ||
64 | dstats = per_cpu_ptr(dev->dstats, i); | 64 | dstats = per_cpu_ptr(dev->dstats, i); |
65 | do { | 65 | do { |
66 | start = u64_stats_fetch_begin(&dstats->syncp); | 66 | start = u64_stats_fetch_begin_bh(&dstats->syncp); |
67 | tbytes = dstats->tx_bytes; | 67 | tbytes = dstats->tx_bytes; |
68 | tpackets = dstats->tx_packets; | 68 | tpackets = dstats->tx_packets; |
69 | } while (u64_stats_fetch_retry(&dstats->syncp, start)); | 69 | } while (u64_stats_fetch_retry_bh(&dstats->syncp, start)); |
70 | stats->tx_bytes += tbytes; | 70 | stats->tx_bytes += tbytes; |
71 | stats->tx_packets += tpackets; | 71 | stats->tx_packets += tpackets; |
72 | } | 72 | } |
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c index 4e20c5f02712..de2190443510 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c | |||
@@ -3131,12 +3131,12 @@ vxge_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *net_stats) | |||
3131 | u64 packets, bytes, multicast; | 3131 | u64 packets, bytes, multicast; |
3132 | 3132 | ||
3133 | do { | 3133 | do { |
3134 | start = u64_stats_fetch_begin(&rxstats->syncp); | 3134 | start = u64_stats_fetch_begin_bh(&rxstats->syncp); |
3135 | 3135 | ||
3136 | packets = rxstats->rx_frms; | 3136 | packets = rxstats->rx_frms; |
3137 | multicast = rxstats->rx_mcast; | 3137 | multicast = rxstats->rx_mcast; |
3138 | bytes = rxstats->rx_bytes; | 3138 | bytes = rxstats->rx_bytes; |
3139 | } while (u64_stats_fetch_retry(&rxstats->syncp, start)); | 3139 | } while (u64_stats_fetch_retry_bh(&rxstats->syncp, start)); |
3140 | 3140 | ||
3141 | net_stats->rx_packets += packets; | 3141 | net_stats->rx_packets += packets; |
3142 | net_stats->rx_bytes += bytes; | 3142 | net_stats->rx_bytes += bytes; |
@@ -3146,11 +3146,11 @@ vxge_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *net_stats) | |||
3146 | net_stats->rx_dropped += rxstats->rx_dropped; | 3146 | net_stats->rx_dropped += rxstats->rx_dropped; |
3147 | 3147 | ||
3148 | do { | 3148 | do { |
3149 | start = u64_stats_fetch_begin(&txstats->syncp); | 3149 | start = u64_stats_fetch_begin_bh(&txstats->syncp); |
3150 | 3150 | ||
3151 | packets = txstats->tx_frms; | 3151 | packets = txstats->tx_frms; |
3152 | bytes = txstats->tx_bytes; | 3152 | bytes = txstats->tx_bytes; |
3153 | } while (u64_stats_fetch_retry(&txstats->syncp, start)); | 3153 | } while (u64_stats_fetch_retry_bh(&txstats->syncp, start)); |
3154 | 3154 | ||
3155 | net_stats->tx_packets += packets; | 3155 | net_stats->tx_packets += packets; |
3156 | net_stats->tx_bytes += bytes; | 3156 | net_stats->tx_bytes += bytes; |
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index 32eb94ece6c1..e2a06fd996d5 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c | |||
@@ -107,10 +107,10 @@ static struct rtnl_link_stats64 *loopback_get_stats64(struct net_device *dev, | |||
107 | 107 | ||
108 | lb_stats = per_cpu_ptr(dev->lstats, i); | 108 | lb_stats = per_cpu_ptr(dev->lstats, i); |
109 | do { | 109 | do { |
110 | start = u64_stats_fetch_begin(&lb_stats->syncp); | 110 | start = u64_stats_fetch_begin_bh(&lb_stats->syncp); |
111 | tbytes = lb_stats->bytes; | 111 | tbytes = lb_stats->bytes; |
112 | tpackets = lb_stats->packets; | 112 | tpackets = lb_stats->packets; |
113 | } while (u64_stats_fetch_retry(&lb_stats->syncp, start)); | 113 | } while (u64_stats_fetch_retry_bh(&lb_stats->syncp, start)); |
114 | bytes += tbytes; | 114 | bytes += tbytes; |
115 | packets += tpackets; | 115 | packets += tpackets; |
116 | } | 116 | } |
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 1db445b2ecc7..83d2b0c34c5e 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
@@ -704,16 +704,16 @@ static struct rtnl_link_stats64 *virtnet_stats(struct net_device *dev, | |||
704 | u64 tpackets, tbytes, rpackets, rbytes; | 704 | u64 tpackets, tbytes, rpackets, rbytes; |
705 | 705 | ||
706 | do { | 706 | do { |
707 | start = u64_stats_fetch_begin(&stats->tx_syncp); | 707 | start = u64_stats_fetch_begin_bh(&stats->tx_syncp); |
708 | tpackets = stats->tx_packets; | 708 | tpackets = stats->tx_packets; |
709 | tbytes = stats->tx_bytes; | 709 | tbytes = stats->tx_bytes; |
710 | } while (u64_stats_fetch_retry(&stats->tx_syncp, start)); | 710 | } while (u64_stats_fetch_retry_bh(&stats->tx_syncp, start)); |
711 | 711 | ||
712 | do { | 712 | do { |
713 | start = u64_stats_fetch_begin(&stats->rx_syncp); | 713 | start = u64_stats_fetch_begin_bh(&stats->rx_syncp); |
714 | rpackets = stats->rx_packets; | 714 | rpackets = stats->rx_packets; |
715 | rbytes = stats->rx_bytes; | 715 | rbytes = stats->rx_bytes; |
716 | } while (u64_stats_fetch_retry(&stats->rx_syncp, start)); | 716 | } while (u64_stats_fetch_retry_bh(&stats->rx_syncp, start)); |
717 | 717 | ||
718 | tot->rx_packets += rpackets; | 718 | tot->rx_packets += rpackets; |
719 | tot->tx_packets += tpackets; | 719 | tot->tx_packets += tpackets; |
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index f4be1bbfef26..333484537600 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c | |||
@@ -127,9 +127,9 @@ static struct rtnl_link_stats64 *br_get_stats64(struct net_device *dev, | |||
127 | const struct br_cpu_netstats *bstats | 127 | const struct br_cpu_netstats *bstats |
128 | = per_cpu_ptr(br->stats, cpu); | 128 | = per_cpu_ptr(br->stats, cpu); |
129 | do { | 129 | do { |
130 | start = u64_stats_fetch_begin(&bstats->syncp); | 130 | start = u64_stats_fetch_begin_bh(&bstats->syncp); |
131 | memcpy(&tmp, bstats, sizeof(tmp)); | 131 | memcpy(&tmp, bstats, sizeof(tmp)); |
132 | } while (u64_stats_fetch_retry(&bstats->syncp, start)); | 132 | } while (u64_stats_fetch_retry_bh(&bstats->syncp, start)); |
133 | sum.tx_bytes += tmp.tx_bytes; | 133 | sum.tx_bytes += tmp.tx_bytes; |
134 | sum.tx_packets += tmp.tx_packets; | 134 | sum.tx_packets += tmp.tx_packets; |
135 | sum.rx_bytes += tmp.rx_bytes; | 135 | sum.rx_bytes += tmp.rx_bytes; |