[PATCH 2/1] net: sch: simplify condtion for selecting mini_Qdisc_pair buffer

From: Seth Forshee
Date: Tue Oct 26 2021 - 14:37:29 EST


From: Seth Forshee <sforshee@xxxxxxxxxxxxxxxx>

The only valid values for a miniq pointer are NULL or a pointer to
miniq1 or miniq2, so testing for miniq_old != &miniq1 is functionally
equivalent to testing that it is NULL or equal to &miniq2.

Suggested-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Seth Forshee <sforshee@xxxxxxxxxxxxxxxx>
---
net/sched/sch_generic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 24899efc51be..3b0f62095803 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -1500,7 +1500,7 @@ void mini_qdisc_pair_swap(struct mini_Qdisc_pair *miniqp,
if (!tp_head) {
RCU_INIT_POINTER(*miniqp->p_miniq, NULL);
} else {
- miniq = !miniq_old || miniq_old == &miniqp->miniq2 ?
+ miniq = miniq_old != &miniqp->miniq1 ?
&miniqp->miniq1 : &miniqp->miniq2;

/* We need to make sure that readers won't see the miniq
--
2.30.2