net: improve queue removal readability in __netif_set_xps_queue
authorAntoine Tenart <atenart@kernel.org>
Thu, 18 Mar 2021 18:37:48 +0000 (19:37 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 18 Mar 2021 21:56:22 +0000 (14:56 -0700)
Improve the readability of the loop removing tx-queue from unused
CPUs/rx-queues in __netif_set_xps_queue. The change should only be
cosmetic.

Signed-off-by: Antoine Tenart <atenart@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c

index 00f6b41..c8ce2df 100644 (file)
@@ -2784,13 +2784,16 @@ out_no_new_maps:
 
        /* removes tx-queue from unused CPUs/rx-queues */
        for (j = 0; j < dev_maps->nr_ids; j++) {
-               for (i = tc, tci = j * dev_maps->num_tc; i--; tci++)
-                       active |= remove_xps_queue(dev_maps, tci, index);
-               if (!netif_attr_test_mask(j, mask, dev_maps->nr_ids) ||
-                   !netif_attr_test_online(j, online_mask, dev_maps->nr_ids))
-                       active |= remove_xps_queue(dev_maps, tci, index);
-               for (i = dev_maps->num_tc - tc, tci++; --i; tci++)
+               tci = j * dev_maps->num_tc;
+
+               for (i = 0; i < dev_maps->num_tc; i++, tci++) {
+                       if (i == tc &&
+                           netif_attr_test_mask(j, mask, dev_maps->nr_ids) &&
+                           netif_attr_test_online(j, online_mask, dev_maps->nr_ids))
+                               continue;
+
                        active |= remove_xps_queue(dev_maps, tci, index);
+               }
        }
 
        /* free map if not active */