28 files changed, 104 insertions, 104 deletions

diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
index 1656317c96f8..0932ffbf381b 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,
 
                 dstats = per_cpu_ptr(dev->dstats, i);
                 do {
-                        start = u64_stats_fetch_begin_bh(&dstats->syncp);
+                        start = u64_stats_fetch_begin_irq(&dstats->syncp);
                         tbytes = dstats->tx_bytes;
                         tpackets = dstats->tx_packets;
-                } while (u64_stats_fetch_retry_bh(&dstats->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&dstats->syncp, start));
                 stats->tx_bytes += tbytes;
                 stats->tx_packets += tpackets;
         }
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index 8a7bf7dad898..05ba62589017 100644
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -1685,7 +1685,7 @@ static struct rtnl_link_stats64 *b44_get_stats64(struct net_device *dev,
         unsigned int start;
 
         do {
-                start = u64_stats_fetch_begin_bh(&hwstat->syncp);
+                start = u64_stats_fetch_begin_irq(&hwstat->syncp);
 
                 /* Convert HW stats into rtnl_link_stats64 stats. */
                 nstat->rx_packets = hwstat->rx_pkts;
@@ -1719,7 +1719,7 @@ static struct rtnl_link_stats64 *b44_get_stats64(struct net_device *dev,
                 /* Carrier lost counter seems to be broken for some devices */
                 nstat->tx_carrier_errors = hwstat->tx_carrier_lost;
 #endif
-        } while (u64_stats_fetch_retry_bh(&hwstat->syncp, start));
+        } while (u64_stats_fetch_retry_irq(&hwstat->syncp, start));
 
         return nstat;
 }
@@ -2073,12 +2073,12 @@ static void b44_get_ethtool_stats(struct net_device *dev,
         do {
                 data_src = &hwstat->tx_good_octets;
                 data_dst = data;
-                start = u64_stats_fetch_begin_bh(&hwstat->syncp);
+                start = u64_stats_fetch_begin_irq(&hwstat->syncp);
 
                 for (i = 0; i < ARRAY_SIZE(b44_gstrings); i++)
                         *data_dst++ = *data_src++;
 
-        } while (u64_stats_fetch_retry_bh(&hwstat->syncp, start));
+        } while (u64_stats_fetch_retry_irq(&hwstat->syncp, start));
 }
 
 static void b44_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 66759b6ce373..15ba96cba65d 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -357,10 +357,10 @@ be_get_ethtool_stats(struct net_device *netdev,
                 struct be_rx_stats *stats = rx_stats(rxo);
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&stats->sync);
+                        start = u64_stats_fetch_begin_irq(&stats->sync);
                         data[base] = stats->rx_bytes;
                         data[base + 1] = stats->rx_pkts;
-                } while (u64_stats_fetch_retry_bh(&stats->sync, start));
+                } while (u64_stats_fetch_retry_irq(&stats->sync, start));
 
                 for (i = 2; i < ETHTOOL_RXSTATS_NUM; i++) {
                         p = (u8 *)stats + et_rx_stats[i].offset;
@@ -373,19 +373,19 @@ be_get_ethtool_stats(struct net_device *netdev,
                 struct be_tx_stats *stats = tx_stats(txo);
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&stats->sync_compl);
+                        start = u64_stats_fetch_begin_irq(&stats->sync_compl);
                         data[base] = stats->tx_compl;
-                } while (u64_stats_fetch_retry_bh(&stats->sync_compl, start));
+                } while (u64_stats_fetch_retry_irq(&stats->sync_compl, start));
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&stats->sync);
+                        start = u64_stats_fetch_begin_irq(&stats->sync);
                         for (i = 1; i < ETHTOOL_TXSTATS_NUM; i++) {
                                 p = (u8 *)stats + et_tx_stats[i].offset;
                                 data[base + i] =
                                         (et_tx_stats[i].size == sizeof(u64)) ?
                                                 *(u64 *)p : *(u32 *)p;
                         }
-                } while (u64_stats_fetch_retry_bh(&stats->sync, start));
+                } while (u64_stats_fetch_retry_irq(&stats->sync, start));
                 base += ETHTOOL_TXSTATS_NUM;
         }
 }
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 239273b7b881..a61f967f9ca1 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -591,10 +591,10 @@ static struct rtnl_link_stats64 *be_get_stats64(struct net_device *netdev,
         for_all_rx_queues(adapter, rxo, i) {
                 const struct be_rx_stats *rx_stats = rx_stats(rxo);
                 do {
-                        start = u64_stats_fetch_begin_bh(&rx_stats->sync);
+                        start = u64_stats_fetch_begin_irq(&rx_stats->sync);
                         pkts = rx_stats(rxo)->rx_pkts;
                         bytes = rx_stats(rxo)->rx_bytes;
-                } while (u64_stats_fetch_retry_bh(&rx_stats->sync, start));
+                } while (u64_stats_fetch_retry_irq(&rx_stats->sync, start));
                 stats->rx_packets += pkts;
                 stats->rx_bytes += bytes;
                 stats->multicast += rx_stats(rxo)->rx_mcast_pkts;
@@ -605,10 +605,10 @@ static struct rtnl_link_stats64 *be_get_stats64(struct net_device *netdev,
         for_all_tx_queues(adapter, txo, i) {
                 const struct be_tx_stats *tx_stats = tx_stats(txo);
                 do {
-                        start = u64_stats_fetch_begin_bh(&tx_stats->sync);
+                        start = u64_stats_fetch_begin_irq(&tx_stats->sync);
                         pkts = tx_stats(txo)->tx_pkts;
                         bytes = tx_stats(txo)->tx_bytes;
-                } while (u64_stats_fetch_retry_bh(&tx_stats->sync, start));
+                } while (u64_stats_fetch_retry_irq(&tx_stats->sync, start));
                 stats->tx_packets += pkts;
                 stats->tx_bytes += bytes;
         }
@@ -1408,15 +1408,15 @@ static void be_eqd_update(struct be_adapter *adapter)
 
                 rxo = &adapter->rx_obj[eqo->idx];
                 do {
-                        start = u64_stats_fetch_begin_bh(&rxo->stats.sync);
+                        start = u64_stats_fetch_begin_irq(&rxo->stats.sync);
                         rx_pkts = rxo->stats.rx_pkts;
-                } while (u64_stats_fetch_retry_bh(&rxo->stats.sync, start));
+                } while (u64_stats_fetch_retry_irq(&rxo->stats.sync, start));
 
                 txo = &adapter->tx_obj[eqo->idx];
                 do {
-                        start = u64_stats_fetch_begin_bh(&txo->stats.sync);
+                        start = u64_stats_fetch_begin_irq(&txo->stats.sync);
                         tx_pkts = txo->stats.tx_reqs;
-                } while (u64_stats_fetch_retry_bh(&txo->stats.sync, start));
+                } while (u64_stats_fetch_retry_irq(&txo->stats.sync, start));
 
 
                 /* Skip, if wrapped around or first calculation */
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 8ee224fdc1d1..6049e63a826d 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -653,18 +653,18 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,
 
                 /* process Tx ring statistics */
                 do {
-                        start = u64_stats_fetch_begin_bh(&tx_ring->syncp);
+                        start = u64_stats_fetch_begin_irq(&tx_ring->syncp);
                         data[i] = tx_ring->stats.packets;
                         data[i + 1] = tx_ring->stats.bytes;
-                } while (u64_stats_fetch_retry_bh(&tx_ring->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&tx_ring->syncp, start));
 
                 /* Rx ring is the 2nd half of the queue pair */
                 rx_ring = &tx_ring[1];
                 do {
-                        start = u64_stats_fetch_begin_bh(&rx_ring->syncp);
+                        start = u64_stats_fetch_begin_irq(&rx_ring->syncp);
                         data[i + 2] = rx_ring->stats.packets;
                         data[i + 3] = rx_ring->stats.bytes;
-                } while (u64_stats_fetch_retry_bh(&rx_ring->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&rx_ring->syncp, start));
         }
         rcu_read_unlock();
         if (vsi == pf->vsi[pf->lan_vsi]) {
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 7379e5a9126b..c66a11e31e6f 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -376,20 +376,20 @@ static struct rtnl_link_stats64 *i40e_get_netdev_stats_struct(
                         continue;
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&tx_ring->syncp);
+                        start = u64_stats_fetch_begin_irq(&tx_ring->syncp);
                         packets = tx_ring->stats.packets;
                         bytes   = tx_ring->stats.bytes;
-                } while (u64_stats_fetch_retry_bh(&tx_ring->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&tx_ring->syncp, start));
 
                 stats->tx_packets += packets;
                 stats->tx_bytes   += bytes;
                 rx_ring = &tx_ring[1];
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&rx_ring->syncp);
+                        start = u64_stats_fetch_begin_irq(&rx_ring->syncp);
                         packets = rx_ring->stats.packets;
                         bytes   = rx_ring->stats.bytes;
-                } while (u64_stats_fetch_retry_bh(&rx_ring->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&rx_ring->syncp, start));
 
                 stats->rx_packets += packets;
                 stats->rx_bytes   += bytes;
@@ -770,10 +770,10 @@ void i40e_update_stats(struct i40e_vsi *vsi)
                 p = ACCESS_ONCE(vsi->tx_rings[q]);
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&p->syncp);
+                        start = u64_stats_fetch_begin_irq(&p->syncp);
                         packets = p->stats.packets;
                         bytes = p->stats.bytes;
-                } while (u64_stats_fetch_retry_bh(&p->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&p->syncp, start));
                 tx_b += bytes;
                 tx_p += packets;
                 tx_restart += p->tx_stats.restart_queue;
@@ -782,10 +782,10 @@ void i40e_update_stats(struct i40e_vsi *vsi)
                 /* Rx queue is part of the same block as Tx queue */
                 p = &p[1];
                 do {
-                        start = u64_stats_fetch_begin_bh(&p->syncp);
+                        start = u64_stats_fetch_begin_irq(&p->syncp);
                         packets = p->stats.packets;
                         bytes = p->stats.bytes;
-                } while (u64_stats_fetch_retry_bh(&p->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&p->syncp, start));
                 rx_b += bytes;
                 rx_p += packets;
                 rx_buf += p->rx_stats.alloc_buff_failed;
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 170e4dbddc11..e35bc1faa452 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -2273,15 +2273,15 @@ static void igb_get_ethtool_stats(struct net_device *netdev,
 
                 ring = adapter->tx_ring[j];
                 do {
-                        start = u64_stats_fetch_begin_bh(&ring->tx_syncp);
+                        start = u64_stats_fetch_begin_irq(&ring->tx_syncp);
                         data[i]   = ring->tx_stats.packets;
                         data[i+1] = ring->tx_stats.bytes;
                         data[i+2] = ring->tx_stats.restart_queue;
-                } while (u64_stats_fetch_retry_bh(&ring->tx_syncp, start));
+                } while (u64_stats_fetch_retry_irq(&ring->tx_syncp, start));
                 do {
-                        start = u64_stats_fetch_begin_bh(&ring->tx_syncp2);
+                        start = u64_stats_fetch_begin_irq(&ring->tx_syncp2);
                         restart2  = ring->tx_stats.restart_queue2;
-                } while (u64_stats_fetch_retry_bh(&ring->tx_syncp2, start));
+                } while (u64_stats_fetch_retry_irq(&ring->tx_syncp2, start));
                 data[i+2] += restart2;
 
                 i += IGB_TX_QUEUE_STATS_LEN;
@@ -2289,13 +2289,13 @@ static void igb_get_ethtool_stats(struct net_device *netdev,
         for (j = 0; j < adapter->num_rx_queues; j++) {
                 ring = adapter->rx_ring[j];
                 do {
-                        start = u64_stats_fetch_begin_bh(&ring->rx_syncp);
+                        start = u64_stats_fetch_begin_irq(&ring->rx_syncp);
                         data[i]   = ring->rx_stats.packets;
                         data[i+1] = ring->rx_stats.bytes;
                         data[i+2] = ring->rx_stats.drops;
                         data[i+3] = ring->rx_stats.csum_err;
                         data[i+4] = ring->rx_stats.alloc_failed;
-                } while (u64_stats_fetch_retry_bh(&ring->rx_syncp, start));
+                } while (u64_stats_fetch_retry_irq(&ring->rx_syncp, start));
                 i += IGB_RX_QUEUE_STATS_LEN;
         }
         spin_unlock(&adapter->stats64_lock);
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index ea8b9c41cf9f..f81d87cfcc8d 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -5168,10 +5168,10 @@ void igb_update_stats(struct igb_adapter *adapter,
                 }
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&ring->rx_syncp);
+                        start = u64_stats_fetch_begin_irq(&ring->rx_syncp);
                         _bytes = ring->rx_stats.bytes;
                         _packets = ring->rx_stats.packets;
-                } while (u64_stats_fetch_retry_bh(&ring->rx_syncp, start));
+                } while (u64_stats_fetch_retry_irq(&ring->rx_syncp, start));
                 bytes += _bytes;
                 packets += _packets;
         }
@@ -5184,10 +5184,10 @@ void igb_update_stats(struct igb_adapter *adapter,
         for (i = 0; i < adapter->num_tx_queues; i++) {
                 struct igb_ring *ring = adapter->tx_ring[i];
                 do {
-                        start = u64_stats_fetch_begin_bh(&ring->tx_syncp);
+                        start = u64_stats_fetch_begin_irq(&ring->tx_syncp);
                         _bytes = ring->tx_stats.bytes;
                         _packets = ring->tx_stats.packets;
-                } while (u64_stats_fetch_retry_bh(&ring->tx_syncp, start));
+                } while (u64_stats_fetch_retry_irq(&ring->tx_syncp, start));
                 bytes += _bytes;
                 packets += _packets;
         }
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index 24dd6f0233f3..6c55c14d082a 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -1128,10 +1128,10 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev,
                 }
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&ring->syncp);
+                        start = u64_stats_fetch_begin_irq(&ring->syncp);
                         data[i]   = ring->stats.packets;
                         data[i+1] = ring->stats.bytes;
-                } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&ring->syncp, start));
                 i += 2;
 #ifdef BP_EXTENDED_STATS
                 data[i] = ring->stats.yields;
@@ -1156,10 +1156,10 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev,
                 }
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&ring->syncp);
+                        start = u64_stats_fetch_begin_irq(&ring->syncp);
                         data[i]   = ring->stats.packets;
                         data[i+1] = ring->stats.bytes;
-                } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&ring->syncp, start));
                 i += 2;
 #ifdef BP_EXTENDED_STATS
                 data[i] = ring->stats.yields;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 851c41377b47..5d314fe873bb 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7293,10 +7293,10 @@ static struct rtnl_link_stats64 *ixgbe_get_stats64(struct net_device *netdev,
 
                 if (ring) {
                         do {
-                                start = u64_stats_fetch_begin_bh(&ring->syncp);
+                                start = u64_stats_fetch_begin_irq(&ring->syncp);
                                 packets = ring->stats.packets;
                                 bytes   = ring->stats.bytes;
-                        } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
+                        } while (u64_stats_fetch_retry_irq(&ring->syncp, start));
                         stats->rx_packets += packets;
                         stats->rx_bytes   += bytes;
                 }
@@ -7309,10 +7309,10 @@ static struct rtnl_link_stats64 *ixgbe_get_stats64(struct net_device *netdev,
 
                 if (ring) {
                         do {
-                                start = u64_stats_fetch_begin_bh(&ring->syncp);
+                                start = u64_stats_fetch_begin_irq(&ring->syncp);
                                 packets = ring->stats.packets;
                                 bytes   = ring->stats.bytes;
-                        } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
+                        } while (u64_stats_fetch_retry_irq(&ring->syncp, start));
                         stats->tx_packets += packets;
                         stats->tx_bytes   += bytes;
                 }
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 475341d0ce7e..8581079791fe 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -3337,10 +3337,10 @@ static struct rtnl_link_stats64 *ixgbevf_get_stats(struct net_device *netdev,
         for (i = 0; i < adapter->num_rx_queues; i++) {
                 ring = adapter->rx_ring[i];
                 do {
-                        start = u64_stats_fetch_begin_bh(&ring->syncp);
+                        start = u64_stats_fetch_begin_irq(&ring->syncp);
                         bytes = ring->stats.bytes;
                         packets = ring->stats.packets;
-                } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&ring->syncp, start));
                 stats->rx_bytes += bytes;
                 stats->rx_packets += packets;
         }
@@ -3348,10 +3348,10 @@ static struct rtnl_link_stats64 *ixgbevf_get_stats(struct net_device *netdev,
         for (i = 0; i < adapter->num_tx_queues; i++) {
                 ring = adapter->tx_ring[i];
                 do {
-                        start = u64_stats_fetch_begin_bh(&ring->syncp);
+                        start = u64_stats_fetch_begin_irq(&ring->syncp);
                         bytes = ring->stats.bytes;
                         packets = ring->stats.packets;
-                } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&ring->syncp, start));
                 stats->tx_bytes += bytes;
                 stats->tx_packets += packets;
         }
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 12c6a66e54d1..f3afcbdbb725 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -508,12 +508,12 @@ struct rtnl_link_stats64 *mvneta_get_stats64(struct net_device *dev,
 
                 cpu_stats = per_cpu_ptr(pp->stats, cpu);
                 do {
-                        start = u64_stats_fetch_begin_bh(&cpu_stats->syncp);
+                        start = u64_stats_fetch_begin_irq(&cpu_stats->syncp);
                         rx_packets = cpu_stats->rx_packets;
                         rx_bytes   = cpu_stats->rx_bytes;
                         tx_packets = cpu_stats->tx_packets;
                         tx_bytes   = cpu_stats->tx_bytes;
-                } while (u64_stats_fetch_retry_bh(&cpu_stats->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&cpu_stats->syncp, start));
 
                 stats->rx_packets += rx_packets;
                 stats->rx_bytes   += rx_bytes;
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 2434611d1b4e..5a5b23741179 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -3908,19 +3908,19 @@ static struct rtnl_link_stats64 *sky2_get_stats(struct net_device *dev,
         u64 _bytes, _packets;
 
         do {
-                start = u64_stats_fetch_begin_bh(&sky2->rx_stats.syncp);
+                start = u64_stats_fetch_begin_irq(&sky2->rx_stats.syncp);
                 _bytes = sky2->rx_stats.bytes;
                 _packets = sky2->rx_stats.packets;
-        } while (u64_stats_fetch_retry_bh(&sky2->rx_stats.syncp, start));
+        } while (u64_stats_fetch_retry_irq(&sky2->rx_stats.syncp, start));
 
         stats->rx_packets = _packets;
         stats->rx_bytes = _bytes;
 
         do {
-                start = u64_stats_fetch_begin_bh(&sky2->tx_stats.syncp);
+                start = u64_stats_fetch_begin_irq(&sky2->tx_stats.syncp);
                 _bytes = sky2->tx_stats.bytes;
                 _packets = sky2->tx_stats.packets;
-        } while (u64_stats_fetch_retry_bh(&sky2->tx_stats.syncp, start));
+        } while (u64_stats_fetch_retry_irq(&sky2->tx_stats.syncp, start));
 
         stats->tx_packets = _packets;
         stats->tx_bytes = _bytes;
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index c83cedd26dec..c5bb1ace4a74 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -3134,12 +3134,12 @@ vxge_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *net_stats)
                 u64 packets, bytes, multicast;
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&rxstats->syncp);
+                        start = u64_stats_fetch_begin_irq(&rxstats->syncp);
 
                         packets   = rxstats->rx_frms;
                         multicast = rxstats->rx_mcast;
                         bytes     = rxstats->rx_bytes;
-                } while (u64_stats_fetch_retry_bh(&rxstats->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&rxstats->syncp, start));
 
                 net_stats->rx_packets += packets;
                 net_stats->rx_bytes += bytes;
@@ -3149,11 +3149,11 @@ vxge_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *net_stats)
                 net_stats->rx_dropped += rxstats->rx_dropped;
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&txstats->syncp);
+                        start = u64_stats_fetch_begin_irq(&txstats->syncp);
 
                         packets = txstats->tx_frms;
                         bytes   = txstats->tx_bytes;
-                } while (u64_stats_fetch_retry_bh(&txstats->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&txstats->syncp, start));
 
                 net_stats->tx_packets += packets;
                 net_stats->tx_bytes += bytes;
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index bad3c057ee8a..811be0bccd14 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -1753,19 +1753,19 @@ nv_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *storage)
 
         /* software stats */
         do {
-                syncp_start = u64_stats_fetch_begin_bh(&np->swstats_rx_syncp);
+                syncp_start = u64_stats_fetch_begin_irq(&np->swstats_rx_syncp);
                 storage->rx_packets       = np->stat_rx_packets;
                 storage->rx_bytes         = np->stat_rx_bytes;
                 storage->rx_dropped       = np->stat_rx_dropped;
                 storage->rx_missed_errors = np->stat_rx_missed_errors;
-        } while (u64_stats_fetch_retry_bh(&np->swstats_rx_syncp, syncp_start));
+        } while (u64_stats_fetch_retry_irq(&np->swstats_rx_syncp, syncp_start));
 
         do {
-                syncp_start = u64_stats_fetch_begin_bh(&np->swstats_tx_syncp);
+                syncp_start = u64_stats_fetch_begin_irq(&np->swstats_tx_syncp);
                 storage->tx_packets = np->stat_tx_packets;
                 storage->tx_bytes   = np->stat_tx_bytes;
                 storage->tx_dropped = np->stat_tx_dropped;
-        } while (u64_stats_fetch_retry_bh(&np->swstats_tx_syncp, syncp_start));
+        } while (u64_stats_fetch_retry_irq(&np->swstats_tx_syncp, syncp_start));
 
         /* If the nic supports hw counters then retrieve latest values */
         if (np->driver_data & DEV_HAS_STATISTICS_V123) {
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
index 8cb2f357026e..2e5df148af4c 100644
--- a/drivers/net/ethernet/realtek/8139too.c
+++ b/drivers/net/ethernet/realtek/8139too.c
@@ -2522,16 +2522,16 @@ rtl8139_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
         netdev_stats_to_stats64(stats, &dev->stats);
 
         do {
-                start = u64_stats_fetch_begin_bh(&tp->rx_stats.syncp);
+                start = u64_stats_fetch_begin_irq(&tp->rx_stats.syncp);
                 stats->rx_packets = tp->rx_stats.packets;
                 stats->rx_bytes = tp->rx_stats.bytes;
-        } while (u64_stats_fetch_retry_bh(&tp->rx_stats.syncp, start));
+        } while (u64_stats_fetch_retry_irq(&tp->rx_stats.syncp, start));
 
         do {
-                start = u64_stats_fetch_begin_bh(&tp->tx_stats.syncp);
+                start = u64_stats_fetch_begin_irq(&tp->tx_stats.syncp);
                 stats->tx_packets = tp->tx_stats.packets;
                 stats->tx_bytes = tp->tx_stats.bytes;
-        } while (u64_stats_fetch_retry_bh(&tp->tx_stats.syncp, start));
+        } while (u64_stats_fetch_retry_irq(&tp->tx_stats.syncp, start));
 
         return stats;
 }
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 90c14d16f261..aa1c079f231d 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -6590,17 +6590,17 @@ rtl8169_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
                 rtl8169_rx_missed(dev, ioaddr);
 
         do {
-                start = u64_stats_fetch_begin_bh(&tp->rx_stats.syncp);
+                start = u64_stats_fetch_begin_irq(&tp->rx_stats.syncp);
                 stats->rx_packets = tp->rx_stats.packets;
                 stats->rx_bytes = tp->rx_stats.bytes;
-        } while (u64_stats_fetch_retry_bh(&tp->rx_stats.syncp, start));
+        } while (u64_stats_fetch_retry_irq(&tp->rx_stats.syncp, start));
 
 
         do {
-                start = u64_stats_fetch_begin_bh(&tp->tx_stats.syncp);
+                start = u64_stats_fetch_begin_irq(&tp->tx_stats.syncp);
                 stats->tx_packets = tp->tx_stats.packets;
                 stats->tx_bytes = tp->tx_stats.bytes;
-        } while (u64_stats_fetch_retry_bh(&tp->tx_stats.syncp, start));
+        } while (u64_stats_fetch_retry_irq(&tp->tx_stats.syncp, start));
 
         stats->rx_dropped       = dev->stats.rx_dropped;
         stats->tx_dropped       = dev->stats.tx_dropped;
diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c
index edb2e12a0fe2..7e33973487ee 100644
--- a/drivers/net/ethernet/tile/tilepro.c
+++ b/drivers/net/ethernet/tile/tilepro.c
@@ -2068,14 +2068,14 @@ static struct rtnl_link_stats64 *tile_net_get_stats64(struct net_device *dev,
                 cpu_stats = &priv->cpu[i]->stats;
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&cpu_stats->syncp);
+                        start = u64_stats_fetch_begin_irq(&cpu_stats->syncp);
                         trx_packets = cpu_stats->rx_packets;
                         ttx_packets = cpu_stats->tx_packets;
                         trx_bytes   = cpu_stats->rx_bytes;
                         ttx_bytes   = cpu_stats->tx_bytes;
                         trx_errors  = cpu_stats->rx_errors;
                         trx_dropped = cpu_stats->rx_dropped;
-                } while (u64_stats_fetch_retry_bh(&cpu_stats->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&cpu_stats->syncp, start));
 
                 rx_packets += trx_packets;
                 tx_packets += ttx_packets;
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index ef312bc6b865..5bc1a2d02dc1 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -2070,16 +2070,16 @@ rhine_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
         netdev_stats_to_stats64(stats, &dev->stats);
 
         do {
-                start = u64_stats_fetch_begin_bh(&rp->rx_stats.syncp);
+                start = u64_stats_fetch_begin_irq(&rp->rx_stats.syncp);
                 stats->rx_packets = rp->rx_stats.packets;
                 stats->rx_bytes = rp->rx_stats.bytes;
-        } while (u64_stats_fetch_retry_bh(&rp->rx_stats.syncp, start));
+        } while (u64_stats_fetch_retry_irq(&rp->rx_stats.syncp, start));
 
         do {
-                start = u64_stats_fetch_begin_bh(&rp->tx_stats.syncp);
+                start = u64_stats_fetch_begin_irq(&rp->tx_stats.syncp);
                 stats->tx_packets = rp->tx_stats.packets;
                 stats->tx_bytes = rp->tx_stats.bytes;
-        } while (u64_stats_fetch_retry_bh(&rp->tx_stats.syncp, start));
+        } while (u64_stats_fetch_retry_irq(&rp->tx_stats.syncp, start));
 
         return stats;
 }
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,
         unsigned int start;
 
         do {
-                start = u64_stats_fetch_begin_bh(&dp->rsync);
+                start = u64_stats_fetch_begin_irq(&dp->rsync);
                 stats->rx_packets = dp->rx_packets;
                 stats->rx_bytes = dp->rx_bytes;
-        } while (u64_stats_fetch_retry_bh(&dp->rsync, start));
+        } while (u64_stats_fetch_retry_irq(&dp->rsync, start));
 
         do {
-                start = u64_stats_fetch_begin_bh(&dp->tsync);
+                start = u64_stats_fetch_begin_irq(&dp->tsync);
 
                 stats->tx_packets = dp->tx_packets;
                 stats->tx_bytes = dp->tx_bytes;
 
-        } while (u64_stats_fetch_retry_bh(&dp->tsync, start));
+        } while (u64_stats_fetch_retry_irq(&dp->tsync, start));
 
         stats->rx_dropped = dev->stats.rx_dropped;
         stats->tx_dropped = dev->stats.tx_dropped;
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 282effee7e1c..bb96409f8c05 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -111,10 +111,10 @@ static struct rtnl_link_stats64 *loopback_get_stats64(struct net_device *dev,
 
                 lb_stats = per_cpu_ptr(dev->lstats, i);
                 do {
-                        start = u64_stats_fetch_begin_bh(&lb_stats->syncp);
+                        start = u64_stats_fetch_begin_irq(&lb_stats->syncp);
                         tbytes = lb_stats->bytes;
                         tpackets = lb_stats->packets;
-                } while (u64_stats_fetch_retry_bh(&lb_stats->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&lb_stats->syncp, start));
                 bytes   += tbytes;
                 packets += tpackets;
         }
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,
                 for_each_possible_cpu(i) {
                         p = per_cpu_ptr(vlan->pcpu_stats, i);
                         do {
-                                start = u64_stats_fetch_begin_bh(&p->syncp);
+                                start = u64_stats_fetch_begin_irq(&p->syncp);
                                 rx_packets      = p->rx_packets;
                                 rx_bytes        = p->rx_bytes;
                                 rx_multicast    = p->rx_multicast;
                                 tx_packets      = p->tx_packets;
                                 tx_bytes        = p->tx_bytes;
-                        } while (u64_stats_fetch_retry_bh(&p->syncp, start));
+                        } while (u64_stats_fetch_retry_irq(&p->syncp, start));
 
                         stats->rx_packets       += rx_packets;
                         stats->rx_bytes         += rx_bytes;
diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
index 14ce7de6a933..6929b03ec638 100644
--- a/drivers/net/nlmon.c
+++ b/drivers/net/nlmon.c
@@ -90,10 +90,10 @@ nlmon_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
                 nl_stats = per_cpu_ptr(dev->lstats, i);
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&nl_stats->syncp);
+                        start = u64_stats_fetch_begin_irq(&nl_stats->syncp);
                         tbytes = nl_stats->bytes;
                         tpackets = nl_stats->packets;
-                } while (u64_stats_fetch_retry_bh(&nl_stats->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&nl_stats->syncp, start));
 
                 packets += tpackets;
                 bytes += tbytes;
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index aea92f02401b..2b1a1d61072c 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1761,13 +1761,13 @@ team_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
         for_each_possible_cpu(i) {
                 p = per_cpu_ptr(team->pcpu_stats, i);
                 do {
-                        start = u64_stats_fetch_begin_bh(&p->syncp);
+                        start = u64_stats_fetch_begin_irq(&p->syncp);
                         rx_packets      = p->rx_packets;
                         rx_bytes        = p->rx_bytes;
                         rx_multicast    = p->rx_multicast;
                         tx_packets      = p->tx_packets;
                         tx_bytes        = p->tx_bytes;
-                } while (u64_stats_fetch_retry_bh(&p->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&p->syncp, start));
 
                 stats->rx_packets       += rx_packets;
                 stats->rx_bytes         += rx_bytes;
diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c
index d671fc3ac5ac..dbde3412ee5e 100644
--- a/drivers/net/team/team_mode_loadbalance.c
+++ b/drivers/net/team/team_mode_loadbalance.c
@@ -432,9 +432,9 @@ static void __lb_one_cpu_stats_add(struct lb_stats *acc_stats,
         struct lb_stats tmp;
 
         do {
-                start = u64_stats_fetch_begin_bh(syncp);
+                start = u64_stats_fetch_begin_irq(syncp);
                 tmp.tx_bytes = cpu_stats->tx_bytes;
-        } while (u64_stats_fetch_retry_bh(syncp, start));
+        } while (u64_stats_fetch_retry_irq(syncp, start));
         acc_stats->tx_bytes += tmp.tx_bytes;
 }
 
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 3aca92e80e1e..e1c77d4b80e4 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -156,10 +156,10 @@ static u64 veth_stats_one(struct pcpu_vstats *result, struct net_device *dev)
                 unsigned int start;
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&stats->syncp);
+                        start = u64_stats_fetch_begin_irq(&stats->syncp);
                         packets = stats->packets;
                         bytes = stats->bytes;
-                } while (u64_stats_fetch_retry_bh(&stats->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&stats->syncp, start));
                 result->packets += packets;
                 result->bytes += bytes;
         }
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 5632a99cbbd2..80d84c446962 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1000,16 +1000,16 @@ static struct rtnl_link_stats64 *virtnet_stats(struct net_device *dev,
                 u64 tpackets, tbytes, rpackets, rbytes;
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&stats->tx_syncp);
+                        start = u64_stats_fetch_begin_irq(&stats->tx_syncp);
                         tpackets = stats->tx_packets;
                         tbytes   = stats->tx_bytes;
-                } while (u64_stats_fetch_retry_bh(&stats->tx_syncp, start));
+                } while (u64_stats_fetch_retry_irq(&stats->tx_syncp, start));
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&stats->rx_syncp);
+                        start = u64_stats_fetch_begin_irq(&stats->rx_syncp);
                         rpackets = stats->rx_packets;
                         rbytes   = stats->rx_bytes;
-                } while (u64_stats_fetch_retry_bh(&stats->rx_syncp, start));
+                } while (u64_stats_fetch_retry_irq(&stats->rx_syncp, start));
 
                 tot->rx_packets += rpackets;
                 tot->tx_packets += tpackets;
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index a38f03ded5a4..49f3b3dbbed8 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1060,13 +1060,13 @@ static struct rtnl_link_stats64 *xennet_get_stats64(struct net_device *dev,
                 unsigned int start;
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&stats->syncp);
+                        start = u64_stats_fetch_begin_irq(&stats->syncp);
 
                         rx_packets = stats->rx_packets;
                         tx_packets = stats->tx_packets;
                         rx_bytes = stats->rx_bytes;
                         tx_bytes = stats->tx_bytes;
-                } while (u64_stats_fetch_retry_bh(&stats->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&stats->syncp, start));
 
                 tot->rx_packets += rx_packets;
                 tot->tx_packets += tx_packets;