torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

netfilter: ebtables: use ADD_COUNTER macro

Browse Source 
xtables uses ADD_COUNTER macro to increase
packet and byte count. ebtables also can use this.

Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Taehee Yoo 2018-03-14 23:36:53 +09:00 committed by Pablo Neira Ayuso
parent 5b4c6e3860
commit d72133e628
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/bridge/netfilter/ebtables.c
View File

@ -223,9 +223,7 @@ unsigned int ebt_do_table(struct sk_buff *skb,
return NF_DROP; return NF_DROP;
} }
/* increase counter */ ADD_COUNTER(*(counter_base + i), 1, skb->len);
(*(counter_base + i)).pcnt++;
(*(counter_base + i)).bcnt += skb->len;
/* these should only watch: not modify, nor tell us /* these should only watch: not modify, nor tell us
* what to do with the packet * what to do with the packet
@ -968,10 +966,9 @@ static void get_counters(const struct ebt_counter *oldcounters,
if (cpu == 0) if (cpu == 0)
continue; continue;
counter_base = COUNTER_BASE(oldcounters, nentries, cpu); counter_base = COUNTER_BASE(oldcounters, nentries, cpu);
for (i = 0; i < nentries; i++) { for (i = 0; i < nentries; i++)
counters[i].pcnt += counter_base[i].pcnt; ADD_COUNTER(counters[i], counter_base[i].pcnt,
counters[i].bcnt += counter_base[i].bcnt; counter_base[i].bcnt);
}
} }
} }
@ -1324,10 +1321,8 @@ static int do_update_counters(struct net *net, const char *name,
write_lock_bh(&t->lock); write_lock_bh(&t->lock);
/* we add to the counters of the first cpu */ /* we add to the counters of the first cpu */
for (i = 0; i < num_counters; i++) { for (i = 0; i < num_counters; i++)
t->private->counters[i].pcnt += tmp[i].pcnt; ADD_COUNTER(t->private->counters[i], tmp[i].pcnt, tmp[i].bcnt);
t->private->counters[i].bcnt += tmp[i].bcnt;
}
write_unlock_bh(&t->lock); write_unlock_bh(&t->lock);
ret = 0; ret = 0;