[SRU][F:linux-bluefield][PATCH 2/2] UBUNTU: SAUCE: net/sched: act_ct: Fix byte count on fragmented packets

[Bodong Wang]

From: Paul Blakey <paulb at nvidia.com>

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

First fragmented packets (frag offset = 0) byte len is zeroed
when stolen by ip_defrag(). And since act_ct update the stats
only afterwards (at end of execute), bytes aren't correctly
accounted for such packets.

To fix this, move stats update to start of action execute.

Fixes: b57dc7c13ea9 ("net/sched: Introduce action ct")
Signed-off-by: Paul Blakey <paulb at nvidia.com>
Signed-off-by: Bodong Wang <bodong at nvidia.com>
---
 net/sched/act_ct.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c
index 8c0b6727..df6c4eb 100644
--- a/net/sched/act_ct.c
+++ b/net/sched/act_ct.c
@@ -953,6 +953,7 @@ static int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,
 	tmpl = p->tmpl;
 
 	tcf_lastuse_update(&c->tcf_tm);
+	tcf_action_update_bstats(&c->common, skb);
 
 	if (clear) {
 		qdisc_skb_cb(skb)->post_ct = false;
@@ -1044,7 +1045,6 @@ static int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,
 
 	qdisc_skb_cb(skb)->post_ct = true;
 out_clear:
-	tcf_action_update_bstats(&c->common, skb);
 	if (defrag)
 		qdisc_skb_cb(skb)->pkt_len = skb->len;
 	return retval;
-- 
1.8.3.1