Re: [PATCH net-next 1/3] virtio_net: Prepare for NAPI to queue mapping

[Gerhard Engleder]

On 10.01.25 21:26, Joe Damato wrote:

Slight refactor to prepare the code for NAPI to queue mapping. No
functional changes.

Signed-off-by: Joe Damato <jdam...@fastly.com>
---
  drivers/net/virtio_net.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 7646ddd9bef7..cff18c66b54a 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2789,7 +2789,8 @@ static void skb_recv_done(struct virtqueue *rvq)
        virtqueue_napi_schedule(&rq->napi, rvq);
  }

-static void virtnet_napi_enable(struct virtqueue *vq, struct napi_struct *napi)

+static void virtnet_napi_do_enable(struct virtqueue *vq,
+                                  struct napi_struct *napi)
  {
        napi_enable(napi);

@@ -2802,6 +2803,11 @@ static void virtnet_napi_enable(struct virtqueue *vq, struct napi_struct *napi)

        local_bh_enable();
  }

+static void virtnet_napi_enable(struct virtqueue *vq, struct napi_struct *napi)

+{
+       virtnet_napi_do_enable(vq, napi);
+}
+
  static void virtnet_napi_tx_enable(struct virtnet_info *vi,
                                   struct virtqueue *vq,
                                   struct napi_struct *napi)
@@ -2817,7 +2823,7 @@ static void virtnet_napi_tx_enable(struct virtnet_info 
*vi,
                return;
        }

- return virtnet_napi_enable(vq, napi);

+       virtnet_napi_do_enable(vq, napi);
  }

static void virtnet_napi_tx_disable(struct napi_struct *napi)

Reviewed-by: Gerhard Engleder <gerh...@engleder-embedded.com>