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

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

netfilter: ebtables: remove EBT_MATCH and EBT_NOMATCH 



EBT_MATCH and EBT_NOMATCH are used to change return value.
match functions(ebt_xxx.c) return false when received frame is not matched
and returns true when received frame is matched.
but, EBT_MATCH_ITERATE understands oppositely.
so, to change return value, EBT_MATCH and EBT_NOMATCH are used.
but, we can use operation '!' simply.

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

include/linux/netfilter_bridge/ebtables.h

+0 −4
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
#include <linux/if_ether.h>

#include <uapi/linux/netfilter_bridge/ebtables.h>



/* return values for match() functions */

#define EBT_MATCH 0

#define EBT_NOMATCH 1



struct ebt_match {

	struct list_head list;

	const char name[EBT_FUNCTION_MAXNAMELEN];

net/bridge/netfilter/ebtables.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ ebt_do_match(struct ebt_entry_match *m, const struct sk_buff *skb, 
{

	par->match     = m->u.match;

	par->matchinfo = m->data;

	return m->u.match->match(skb, par) ? EBT_MATCH : EBT_NOMATCH;

	return !m->u.match->match(skb, par);

}



static inline int