net: improve queue removal readability in __netif_set_xps_queue

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>

diff --git a/net/core/dev.c b/net/core/dev.c
index 00f6b41e11d8fa549f124c390c0cf1c0650d3d09..c8ce2dfcc97d4034812f1970de23309d94cf1785 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -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 */