From a9aa5e3320ae9d322091993e4ed1b7e7651f00a1 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Mon, 13 Dec 2021 17:29:31 +0100
Subject: [PATCH] net: dev: Change the order of the arguments for the contended condition.
Git-commit: a9aa5e3320ae9d322091993e4ed1b7e7651f00a1
Patch-mainline: v5.17-rc1
References: bsc#1189998
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>
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
---
net/core/dev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index 53bef2aae378..a855e41bbe39 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3724,7 +3724,7 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
* 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);
--
2.35.1