Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d72133e6 authored by Taehee Yoo's avatar Taehee Yoo Committed by Pablo Neira Ayuso
Browse files

netfilter: ebtables: use ADD_COUNTER macro 



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

Signed-off-by: default avatarTaehee Yoo <ap420073@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 5b4c6e38

net/bridge/netfilter/ebtables.c

+6 −11
Original line number Diff line number Diff line
@@ -223,9 +223,7 @@ unsigned int ebt_do_table(struct sk_buff *skb, 
			return NF_DROP;

		}



		/* increase counter */

		(*(counter_base + i)).pcnt++;

		(*(counter_base + i)).bcnt += skb->len;

		ADD_COUNTER(*(counter_base + i), 1, skb->len);



		/* these should only watch: not modify, nor tell us

		 * what to do with the packet
@@ -968,10 +966,9 @@ static void get_counters(const struct ebt_counter *oldcounters, 
		if (cpu == 0)

			continue;

		counter_base = COUNTER_BASE(oldcounters, nentries, cpu);

		for (i = 0; i < nentries; i++) {

			counters[i].pcnt += counter_base[i].pcnt;

			counters[i].bcnt += counter_base[i].bcnt;

		}

		for (i = 0; i < nentries; i++)

			ADD_COUNTER(counters[i], counter_base[i].pcnt,

				    counter_base[i].bcnt);

	}

}
@@ -1324,10 +1321,8 @@ static int do_update_counters(struct net *net, const char *name, 
	write_lock_bh(&t->lock);



	/* we add to the counters of the first cpu */

	for (i = 0; i < num_counters; i++) {

		t->private->counters[i].pcnt += tmp[i].pcnt;

		t->private->counters[i].bcnt += tmp[i].bcnt;

	}

	for (i = 0; i < num_counters; i++)

		ADD_COUNTER(t->private->counters[i], tmp[i].pcnt, tmp[i].bcnt);



	write_unlock_bh(&t->lock);

	ret = 0;