net_sched: act: action flushing missaccounting

jhsmt · davem330 · commit 805c1f4aedab · 2014-01-06T16:46:56.000-05:00
action flushing missaccounting
Account only for deleted actions

Signed-off-by: Jamal Hadi Salim &lt;jhs@mojatatu.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
@@ -126,9 +126,10 @@ static int tcf_del_walker(struct sk_buff *skb, struct tc_action *a,
 	for (i = 0; i < (hinfo->hmask + 1); i++) {
 		head = &hinfo->htab[tcf_hash(i, hinfo->hmask)];
 		hlist_for_each_entry_safe(p, n, head, tcfc_head) {
-			if (ACT_P_DELETED == tcf_hash_release(p, 0, hinfo))
+			if (ACT_P_DELETED == tcf_hash_release(p, 0, hinfo)) {
 				module_put(a->ops->owner);
-			n_i++;
+				n_i++;
+			}
 		}
 	}
 	if (nla_put_u32(skb, TCA_FCNT, n_i))

Original file line number	Diff line number	Diff line change
`@@ -126,9 +126,10 @@ static int tcf_del_walker(struct sk_buff skb, struct tc_action a,`
`126`	`126`	`for (i = 0; i < (hinfo->hmask + 1); i++) {`
`127`	`127`	`head = &hinfo->htab[tcf_hash(i, hinfo->hmask)];`
`128`	`128`	`hlist_for_each_entry_safe(p, n, head, tcfc_head) {`
`129`		`- if (ACT_P_DELETED == tcf_hash_release(p, 0, hinfo))`
	`129`	`+ if (ACT_P_DELETED == tcf_hash_release(p, 0, hinfo)) {`
`130`	`130`	`module_put(a->ops->owner);`
`131`		`- n_i++;`
	`131`	`+ n_i++;`
	`132`	`+ }`
`132`	`133`	`}`
`133`	`134`	`}`
`134`	`135`	`if (nla_put_u32(skb, TCA_FCNT, n_i))`