net: refactor netdev_rx_queue_restart() to use local qops

Shorten the lines by storing dev->queue_mgmt_ops in a temp variable.

Reviewed-by: Mina Almasry <almasrymina@google.com>
Link: https://patch.msgid.link/20250206225638.1387810-2-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/core/netdev_rx_queue.c b/net/core/netdev_rx_queue.c
index db46880f37ccf493cc8107a11f717068fb6df8f3..d421abe06c03003f41f4e4b49699bf83512ff36c 100644 (file)
--- a/net/core/netdev_rx_queue.c
+++ b/net/core/netdev_rx_queue.c
@@ -10,28 +10,27 @@
 int netdev_rx_queue_restart(struct net_device *dev, unsigned int rxq_idx)
 {
        struct netdev_rx_queue *rxq = __netif_get_rx_queue(dev, rxq_idx);
+       const struct netdev_queue_mgmt_ops *qops = dev->queue_mgmt_ops;
        void *new_mem, *old_mem;
        int err;
 
-       if (!dev->queue_mgmt_ops || !dev->queue_mgmt_ops->ndo_queue_stop ||
-           !dev->queue_mgmt_ops->ndo_queue_mem_free ||
-           !dev->queue_mgmt_ops->ndo_queue_mem_alloc ||
-           !dev->queue_mgmt_ops->ndo_queue_start)
+       if (!qops || !qops->ndo_queue_stop || !qops->ndo_queue_mem_free ||
+           !qops->ndo_queue_mem_alloc || !qops->ndo_queue_start)
                return -EOPNOTSUPP;
 
        ASSERT_RTNL();
 
-       new_mem = kvzalloc(dev->queue_mgmt_ops->ndo_queue_mem_size, GFP_KERNEL);
+       new_mem = kvzalloc(qops->ndo_queue_mem_size, GFP_KERNEL);
        if (!new_mem)
                return -ENOMEM;
 
-       old_mem = kvzalloc(dev->queue_mgmt_ops->ndo_queue_mem_size, GFP_KERNEL);
+       old_mem = kvzalloc(qops->ndo_queue_mem_size, GFP_KERNEL);
        if (!old_mem) {
                err = -ENOMEM;
                goto err_free_new_mem;
        }
 
-       err = dev->queue_mgmt_ops->ndo_queue_mem_alloc(dev, new_mem, rxq_idx);
+       err = qops->ndo_queue_mem_alloc(dev, new_mem, rxq_idx);
        if (err)
                goto err_free_old_mem;
 
@@ -39,15 +38,15 @@ int netdev_rx_queue_restart(struct net_device *dev, unsigned int rxq_idx)
        if (err)
                goto err_free_new_queue_mem;
 
-       err = dev->queue_mgmt_ops->ndo_queue_stop(dev, old_mem, rxq_idx);
+       err = qops->ndo_queue_stop(dev, old_mem, rxq_idx);
        if (err)
                goto err_free_new_queue_mem;
 
-       err = dev->queue_mgmt_ops->ndo_queue_start(dev, new_mem, rxq_idx);
+       err = qops->ndo_queue_start(dev, new_mem, rxq_idx);
        if (err)
                goto err_start_queue;
 
-       dev->queue_mgmt_ops->ndo_queue_mem_free(dev, old_mem);
+       qops->ndo_queue_mem_free(dev, old_mem);
 
        kvfree(old_mem);
        kvfree(new_mem);
@@ -62,15 +61,15 @@ err_start_queue:
         * WARN if we fail to recover the old rx queue, and at least free
         * old_mem so we don't also leak that.
         */
-       if (dev->queue_mgmt_ops->ndo_queue_start(dev, old_mem, rxq_idx)) {
+       if (qops->ndo_queue_start(dev, old_mem, rxq_idx)) {
                WARN(1,
                     "Failed to restart old queue in error path. RX queue %d may be unhealthy.",
                     rxq_idx);
-               dev->queue_mgmt_ops->ndo_queue_mem_free(dev, old_mem);
+               qops->ndo_queue_mem_free(dev, old_mem);
        }
 
 err_free_new_queue_mem:
-       dev->queue_mgmt_ops->ndo_queue_mem_free(dev, new_mem);
+       qops->ndo_queue_mem_free(dev, new_mem);
 
 err_free_old_mem:
        kvfree(old_mem);