Skip to content

Commit e0508b4

Browse files
committed
net: Remove the obsolte u64_stats_fetch_*_irq() users (drivers).
Author: Thomas Gleixner <tglx@linutronix.de> Now that the 32bit UP oddity is gone and 32bit uses always a sequence count, there is no need for the fetch_irq() variants anymore. Convert to the regular interface. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Jakub Kicinski <kuba@kernel.org> (cherry picked from commit 068c38a) Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2104471 Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
1 parent 7624b1e commit e0508b4

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

drivers/net/ethernet/intel/igc/igc_ethtool.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -839,29 +839,29 @@ static void igc_ethtool_get_stats(struct net_device *netdev,
839839

840840
ring = adapter->tx_ring[j];
841841
do {
842-
start = u64_stats_fetch_begin_irq(&ring->tx_syncp);
842+
start = u64_stats_fetch_begin(&ring->tx_syncp);
843843
data[i] = ring->tx_stats.packets;
844844
data[i + 1] = ring->tx_stats.bytes;
845845
data[i + 2] = ring->tx_stats.restart_queue;
846-
} while (u64_stats_fetch_retry_irq(&ring->tx_syncp, start));
846+
} while (u64_stats_fetch_retry(&ring->tx_syncp, start));
847847
do {
848-
start = u64_stats_fetch_begin_irq(&ring->tx_syncp2);
848+
start = u64_stats_fetch_begin(&ring->tx_syncp2);
849849
restart2 = ring->tx_stats.restart_queue2;
850-
} while (u64_stats_fetch_retry_irq(&ring->tx_syncp2, start));
850+
} while (u64_stats_fetch_retry(&ring->tx_syncp2, start));
851851
data[i + 2] += restart2;
852852

853853
i += IGC_TX_QUEUE_STATS_LEN;
854854
}
855855
for (j = 0; j < adapter->num_rx_queues; j++) {
856856
ring = adapter->rx_ring[j];
857857
do {
858-
start = u64_stats_fetch_begin_irq(&ring->rx_syncp);
858+
start = u64_stats_fetch_begin(&ring->rx_syncp);
859859
data[i] = ring->rx_stats.packets;
860860
data[i + 1] = ring->rx_stats.bytes;
861861
data[i + 2] = ring->rx_stats.drops;
862862
data[i + 3] = ring->rx_stats.csum_err;
863863
data[i + 4] = ring->rx_stats.alloc_failed;
864-
} while (u64_stats_fetch_retry_irq(&ring->rx_syncp, start));
864+
} while (u64_stats_fetch_retry(&ring->rx_syncp, start));
865865
i += IGC_RX_QUEUE_STATS_LEN;
866866
}
867867
spin_unlock(&adapter->stats64_lock);

drivers/net/ethernet/intel/igc/igc_main.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4682,10 +4682,10 @@ void igc_update_stats(struct igc_adapter *adapter)
46824682
}
46834683

46844684
do {
4685-
start = u64_stats_fetch_begin_irq(&ring->rx_syncp);
4685+
start = u64_stats_fetch_begin(&ring->rx_syncp);
46864686
_bytes = ring->rx_stats.bytes;
46874687
_packets = ring->rx_stats.packets;
4688-
} while (u64_stats_fetch_retry_irq(&ring->rx_syncp, start));
4688+
} while (u64_stats_fetch_retry(&ring->rx_syncp, start));
46894689
bytes += _bytes;
46904690
packets += _packets;
46914691
}
@@ -4699,10 +4699,10 @@ void igc_update_stats(struct igc_adapter *adapter)
46994699
struct igc_ring *ring = adapter->tx_ring[i];
47004700

47014701
do {
4702-
start = u64_stats_fetch_begin_irq(&ring->tx_syncp);
4702+
start = u64_stats_fetch_begin(&ring->tx_syncp);
47034703
_bytes = ring->tx_stats.bytes;
47044704
_packets = ring->tx_stats.packets;
4705-
} while (u64_stats_fetch_retry_irq(&ring->tx_syncp, start));
4705+
} while (u64_stats_fetch_retry(&ring->tx_syncp, start));
47064706
bytes += _bytes;
47074707
packets += _packets;
47084708
}

0 commit comments

Comments
 (0)