diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-01-20 21:28:23 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-01-20 21:28:23 +0100 |
| commit | b3c588cd553d6996cc97f3dc0a7081b9a9b36b48 (patch) | |
| tree | 37e51018ad3f74bf91a7b4a54a0893d048440bd1 /drivers/net/virtio_net.c | |
| parent | Merge branch 'octeontx2-af-miscellaneous-changes-for-cpt' (diff) | |
| parent | Merge tag 'net-6.2-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ne... (diff) | |
| download | linux-b3c588cd553d6996cc97f3dc0a7081b9a9b36b48.tar.xz linux-b3c588cd553d6996cc97f3dc0a7081b9a9b36b48.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/ipa/ipa_interrupt.c
drivers/net/ipa/ipa_interrupt.h
9ec9b2a30853 ("net: ipa: disable ipa interrupt during suspend")
8e461e1f092b ("net: ipa: introduce ipa_interrupt_enable()")
d50ed3558719 ("net: ipa: enable IPA interrupt handlers separate from registration")
https://lore.kernel.org/all/20230119114125.5182c7ab@canb.auug.org.au/
https://lore.kernel.org/all/79e46152-8043-a512-79d9-c3b905462774@tessares.net/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index c0e59d660600..a170b0075dcf 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1998,8 +1998,10 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev) */ if (sq->vq->num_free < 2+MAX_SKB_FRAGS) { netif_stop_subqueue(dev, qnum); - if (!use_napi && - unlikely(!virtqueue_enable_cb_delayed(sq->vq))) { + if (use_napi) { + if (unlikely(!virtqueue_enable_cb_delayed(sq->vq))) + virtqueue_napi_schedule(&sq->napi, sq->vq); + } else if (unlikely(!virtqueue_enable_cb_delayed(sq->vq))) { /* More just got used, free them then recheck. */ free_old_xmit_skbs(sq, false); if (sq->vq->num_free >= 2+MAX_SKB_FRAGS) { |