diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2025-09-06 10:17:35 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2025-09-06 10:17:35 +0200 |
| commit | d035b4baebfc5112b128b66cafd45d2522a9c8f1 (patch) | |
| tree | fc96e96e81597068c9a869c679d18a1a44394164 /drivers/net/virtio_net.c | |
| parent | Linux 6.17-rc3 (diff) | |
| parent | i2c: rtl9300: remove broken SMBus Quick operation support (diff) | |
| download | linux-d035b4baebfc5112b128b66cafd45d2522a9c8f1.tar.gz linux-d035b4baebfc5112b128b66cafd45d2522a9c8f1.zip | |
Merge tag 'i2c-host-fixes-6.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current
i2c-host-fixes for v6.17-rc5
- i801: fix device IDs
- in rtl9300:
- fix channel number check in probe
- check data length boundaries in xfer
- drop unsupported SMBus quick operation
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index d14e6d602273..975bdc5dab84 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -5758,14 +5758,15 @@ static void virtnet_freeze_down(struct virtio_device *vdev) disable_rx_mode_work(vi); flush_work(&vi->rx_mode_work); - netif_tx_lock_bh(vi->dev); - netif_device_detach(vi->dev); - netif_tx_unlock_bh(vi->dev); if (netif_running(vi->dev)) { rtnl_lock(); virtnet_close(vi->dev); rtnl_unlock(); } + + netif_tx_lock_bh(vi->dev); + netif_device_detach(vi->dev); + netif_tx_unlock_bh(vi->dev); } static int init_vqs(struct virtnet_info *vi); |