From dcf32aa22db38f03c7b94f9c70e74739997df784 Mon Sep 17 00:00:00 2001
From: Jiafei Pan <Jiafei.Pan@nxp.com>
Date: Tue, 7 Sep 2021 16:06:37 +0800
Subject: [PATCH] LF-4552 net: sched: remove duplicated code

The same patch "net: sched: add barrier to ensure correct
ordering for lockless qdisc" is duplicated with these
two commit ID (e7c3ae47978f97f528d95b0c86de51896e78d9f0
and 9486b3dd7caa86aee98518ba8c1136918d16c6bb) in the process
of merge(commid ID: 8b0b3fafda0b171698b8172eb0b63b1a07b4fe47):

Signed-off-by: Jiafei Pan <Jiafei.Pan@nxp.com>
---
 include/net/sch_generic.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 712eb08699fb2..e79bba4d97a3b 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -179,12 +179,6 @@ static inline bool qdisc_run_begin(struct Qdisc *qdisc)
 		 */
 		smp_mb__before_atomic();
 
-		/* Paired with smp_mb__after_atomic() to make sure
-		 * STATE_MISSED checking is synchronized with clearing
-		 * in pfifo_fast_dequeue().
-		 */
-		smp_mb__before_atomic();
-
 		/* If the MISSED flag is set, it means other thread has
 		 * set the MISSED flag before second spin_trylock(), so
 		 * we can return false here to avoid multi cpus doing
-- 
GitLab