]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: dev: Change the order of the arguments for the contended condition.
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Mon, 13 Dec 2021 16:29:31 +0000 (17:29 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Dec 2021 12:34:08 +0000 (12:34 +0000)
Change the order of arguments and make qdisc_is_running() appear first.
This is more readable for the general case.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c

index 53bef2aae37827732963e489d5c49b67021fb77b..a855e41bbe392c57cdc91c41065eb1fcbbbe103c 100644 (file)
@@ -3724,7 +3724,7 @@ no_lock_out:
         * sent after the qdisc owner is scheduled again. To prevent this
         * scenario the task always serialize on the lock.
         */
-       contended = IS_ENABLED(CONFIG_PREEMPT_RT) || qdisc_is_running(q);
+       contended = qdisc_is_running(q) || IS_ENABLED(CONFIG_PREEMPT_RT);
        if (unlikely(contended))
                spin_lock(&q->busylock);