| Message ID | Ybd06waO3S5y1Q6h@linutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a9aa5e3320ae9d322091993e4ed1b7e7651f00a1 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: dev: Change the order of the arguments for the contended condition. | expand |
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Mon, 13 Dec 2021 17:29:31 +0100 you wrote: > 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> > --- > net/core/dev.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Here is the summary with links: - [net-next] net: dev: Change the order of the arguments for the contended condition. https://git.kernel.org/netdev/net-next/c/a9aa5e3320ae You are awesome, thank you!
diff --git a/net/core/dev.c b/net/core/dev.c index 8438553c06b8e..6d73a55ddf5f9 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3841,7 +3841,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);
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> --- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)