Skip to contentSkip to conversation

act_mirred: combine duplicate code

PATCH Applied Changli Gao 3 participants 4 messages Jun 30, 2010

Subsystems (3)
Networking Network drivers Traffic control (tc)
lore
Share & tools
lore

Changli Gao

author
#0 lore raw

PATCH 1/1 act_mirred: combine duplicate code

act_mirred: combine duplicate code

tcf_bstats is updated in any way, so we can do it earlier to reduce the size of the code.

Signed-off-by Changli Gao <[email protected]>

----

 net/sched/act_mirred.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
net/sched/act_mirred.c +2 -4
index 2e9a7b9..a16b017 100644
@@ -160,6 +160,8 @@ static int tcf_mirred(struct sk_buff *skb, struct tc_action *a,
 
 	spin_lock(&m->tcf_lock);
 	m->tcf_tm.lastuse = jiffies;
+	m->tcf_bstats.bytes += qdisc_pkt_len(skb);
+	m->tcf_bstats.packets++;
 
 	dev = m->tcfm_dev;
 	if (!(dev->flags & IFF_UP)) {

@@ -174,8 +176,6 @@ static int tcf_mirred(struct sk_buff *skb, struct tc_action *a,
 	if (skb2 == NULL)
 		goto out;
 
-	m->tcf_bstats.bytes += qdisc_pkt_len(skb2);
-	m->tcf_bstats.packets++;
 	if (!(at & AT_EGRESS)) {
 		if (m->tcfm_ok_push)
 			skb_push(skb2, skb2->dev->hard_header_len);

@@ -193,8 +193,6 @@ static int tcf_mirred(struct sk_buff *skb, struct tc_action *a,
 out:
 	if (err) {
 		m->tcf_qstats.overlimits++;
-		m->tcf_bstats.bytes += qdisc_pkt_len(skb);
-		m->tcf_bstats.packets++;
 		/* should we be asking for packet to be dropped?
 		 * may make sense for redirect case only
 		 */
#1 lore raw

removed lkml

Quoted 4 lines · Changli Gao

act_mirred: combine duplicate code

tcf_bstats is updated in any way, so we can do it earlier to reduce the size of the code.

There is one condition when !(dev->flags & IFF_UP) where we dont update the stats in current code. This changes with your patch.
It would make sense to actually update at that point (as you do) and additionally increment some other counter to track that like m->tcf_qstats.drops. I suggest resubmit with that change and add my signed-off.

cheers,
jamal

#2 lore raw
Quoted 1 line · jamal

m->tcf_qstats.drops.

Sorry - this nagged me - we are already incrementing overlimits - we should increment drops. Scratch that too. I am going to say your patch as is:

Signed-off-by Jamal Hadi Salim <[email protected]>

cheers,
jamal

maintainer Applied
#3 lore raw

From: jamal <[email protected]>
Date: Wed, 30 Jun 2010 06:49:02 -0400

Quoted 8 lines · jamal
Quoted 2 lines

m->tcf_qstats.drops.

Sorry - this nagged me - we are already incrementing overlimits - we should increment drops. Scratch that too. I am going to say your patch as is:

Signed-off-by Jamal Hadi Salim <[email protected]>

Applied.

Jamal, please capitalize "Signed-off-by" in the future, thanks.