diff options
| author |   Mark Brown <broonie@kernel.org> | 2022-09-10 16:39:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-09-10 16:39:51 +0100 |
| commit | 824723ccf53fc53ecf896753c562b00a5d6307eb (patch) | |
| tree | c0ec150c4510eb161ba57a7fd39a1393f3b77cdd /drivers/net/netdevsim/netdev.c | |
| parent | spi: Group cs_change and cs_off flags together in struct spi_transfer (diff) | |
| parent | Linux 6.0-rc4 (diff) | |
| download | linux-dev-824723ccf53fc53ecf896753c562b00a5d6307eb.tar.xz linux-dev-824723ccf53fc53ecf896753c562b00a5d6307eb.zip | |
spi: Merge tag 'v6.0-rc4' into spi-6.1
Linux 6.0-rc4 so we can test on BeagleBone again.
Diffstat (limited to 'drivers/net/netdevsim/netdev.c')
| -rw-r--r-- | drivers/net/netdevsim/netdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index e470e3398abc..9a1a5b203624 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -67,10 +67,10 @@ nsim_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) unsigned int start; do { - start = u64_stats_fetch_begin(&ns->syncp); + start = u64_stats_fetch_begin_irq(&ns->syncp); stats->tx_bytes = ns->tx_bytes; stats->tx_packets = ns->tx_packets; - } while (u64_stats_fetch_retry(&ns->syncp, start)); + } while (u64_stats_fetch_retry_irq(&ns->syncp, start)); } static int |