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

Commit 001a18d3 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy
Browse files

netfilter: add dummy members to Ebtables code to ease transition to Xtables 



Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 0ac6ab1f

include/linux/netfilter_bridge/ebtables.h

+6 −0
Original line number Diff line number Diff line
@@ -214,6 +214,8 @@ struct ebt_match 
	   const struct ebt_entry *e, void *matchdata, unsigned int datalen);

	void (*destroy)(void *matchdata, unsigned int datalen);

	unsigned int matchsize;

	u_int8_t revision;

	u_int8_t family;

	struct module *me;

};
@@ -228,6 +230,8 @@ struct ebt_watcher 
	   const struct ebt_entry *e, void *watcherdata, unsigned int datalen);

	void (*destroy)(void *watcherdata, unsigned int datalen);

	unsigned int targetsize;

	u_int8_t revision;

	u_int8_t family;

	struct module *me;

};
@@ -243,6 +247,8 @@ struct ebt_target 
	   const struct ebt_entry *e, void *targetdata, unsigned int datalen);

	void (*destroy)(void *targetdata, unsigned int datalen);

	unsigned int targetsize;

	u_int8_t revision;

	u_int8_t family;

	struct module *me;

};

net/bridge/netfilter/ebt_802_3.c

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ static bool ebt_802_3_check(const char *tablename, unsigned int hookmask, 


static struct ebt_match filter_802_3 __read_mostly = {

	.name		= EBT_802_3_MATCH,

	.revision	= 0,

	.family		= NFPROTO_BRIDGE,

	.match		= ebt_filter_802_3,

	.check		= ebt_802_3_check,

	.matchsize	= XT_ALIGN(sizeof(struct ebt_802_3_info)),

net/bridge/netfilter/ebt_among.c

+2 −0
Original line number Diff line number Diff line
@@ -211,6 +211,8 @@ ebt_among_check(const char *tablename, unsigned int hookmask, 


static struct ebt_match filter_among __read_mostly = {

	.name		= EBT_AMONG_MATCH,

	.revision	= 0,

	.family		= NFPROTO_BRIDGE,

	.match		= ebt_filter_among,

	.check		= ebt_among_check,

	.matchsize	= -1, /* special case */

net/bridge/netfilter/ebt_arp.c

+2 −0
Original line number Diff line number Diff line
@@ -117,6 +117,8 @@ static bool ebt_arp_check(const char *tablename, unsigned int hookmask, 


static struct ebt_match filter_arp __read_mostly = {

	.name		= EBT_ARP_MATCH,

	.revision	= 0,

	.family		= NFPROTO_BRIDGE,

	.match		= ebt_filter_arp,

	.check		= ebt_arp_check,

	.matchsize	= XT_ALIGN(sizeof(struct ebt_arp_info)),

net/bridge/netfilter/ebt_arpreply.c

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ static bool ebt_target_reply_check(const char *tablename, unsigned int hookmask, 


static struct ebt_target reply_target __read_mostly = {

	.name		= EBT_ARPREPLY_TARGET,

	.revision	= 0,

	.family		= NFPROTO_BRIDGE,

	.target		= ebt_target_reply,

	.check		= ebt_target_reply_check,

	.targetsize	= XT_ALIGN(sizeof(struct ebt_arpreply_info)),