[SRU][F:linux-bluefield][PATCH 1/2] Revert "UBUNTU: SAUCE: net/sched: act_mirred: Reset ct when reinserting skb back into queue"

Bodong Wang bodong at nvidia.com
Wed Aug 18 16:38:45 UTC 2021

From: Roi Dayan <roid at nvidia.com>

BugLink: https://bugs.launchpad.net/bugs/1940448

This reverts commit c2fca3bd2543735af1b6d6332cecf1fade5e94d3.
Replace with upstream commit:
d09c548dbf3b net: sched: act_mirred: Reset ct info when mirror/redirect skb

Signed-off-by: Roi Dayan <roid at nvidia.com>
Signed-off-by: Bodong Wang <bodong at nvidia.com>
 net/sched/act_mirred.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 6556003..5ae3e31 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -286,8 +286,6 @@ static int tcf_mirred_act(struct sk_buff *skb, const struct tc_action *a,
 		/* let's the caller reinsert the packet, if possible */
 		if (use_reinsert) {
-			if (want_ingress)
-				nf_reset_ct(skb);
 			res->ingress = want_ingress;
 			if (skb_tc_reinsert(skb, res))

More information about the kernel-team mailing list