Revert "net/sched: flower: Fix wrong handle assignment during filter change"

w1ldptr · davem330 · commit 5110f3ff6d3c · 2023-05-05T10:01:31.000+01:00
This reverts commit 32eff6b. Superseded by the following commit in this series. Signed-off-by: Vlad Buslov <vladbu@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
@@ -2231,8 +2231,8 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
 			kfree(fnew);
 			goto errout_tb;
 		}
-		fnew->handle = handle;
 	}
+	fnew->handle = handle;
 
 	err = tcf_exts_init_ex(&fnew->exts, net, TCA_FLOWER_ACT, 0, tp, handle,
 			       !tc_skip_hw(fnew->flags));

Original file line number	Diff line number	Diff line change
`@@ -2231,8 +2231,8 @@ static int fl_change(struct net net, struct sk_buff in_skb,`
`2231`	`2231`	`kfree(fnew);`
`2232`	`2232`	`goto errout_tb;`
`2233`	`2233`	`}`
`2234`		`- fnew->handle = handle;`
`2235`	`2234`	`}`
	`2235`	`+ fnew->handle = handle;`
`2236`	`2236`
`2237`	`2237`	`err = tcf_exts_init_ex(&fnew->exts, net, TCA_FLOWER_ACT, 0, tp, handle,`
`2238`	`2238`	`!tc_skip_hw(fnew->flags));`