7 files changed, 34 insertions, 34 deletions

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;
         }