diff options
author | Jakub Kicinski <kuba@kernel.org> | 2022-09-01 12:58:02 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-09-01 12:58:02 -0700 |
commit | 60ad1100d525699bce83690757ff3077c6ab83ab (patch) | |
tree | fd25eb112f4d52f4f5209bb0c83b6c36d25793ae /drivers/net/ethernet/huawei/hinic/hinic_rx.c | |
parent | 4bf8594a8036f42ca7ece1bbdaf45b7954fb09e6 (diff) | |
parent | 42e66b1cc3a070671001f8a1e933a80818a192bf (diff) | |
download | linux-stable-60ad1100d525699bce83690757ff3077c6ab83ab.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
tools/testing/selftests/net/.gitignore
sort the net-next version and use it
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/huawei/hinic/hinic_rx.c')
-rw-r--r-- | drivers/net/ethernet/huawei/hinic/hinic_rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/huawei/hinic/hinic_rx.c b/drivers/net/ethernet/huawei/hinic/hinic_rx.c index a866bea65110..e5828a658caf 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_rx.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_rx.c @@ -74,14 +74,14 @@ void hinic_rxq_get_stats(struct hinic_rxq *rxq, struct hinic_rxq_stats *stats) unsigned int start; do { - start = u64_stats_fetch_begin(&rxq_stats->syncp); + start = u64_stats_fetch_begin_irq(&rxq_stats->syncp); stats->pkts = rxq_stats->pkts; stats->bytes = rxq_stats->bytes; stats->errors = rxq_stats->csum_errors + rxq_stats->other_errors; stats->csum_errors = rxq_stats->csum_errors; stats->other_errors = rxq_stats->other_errors; - } while (u64_stats_fetch_retry(&rxq_stats->syncp, start)); + } while (u64_stats_fetch_retry_irq(&rxq_stats->syncp, start)); } /** |