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

Commit 95eea855 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy
Browse files

[NETFILTER]: remove arpt_target indirection macro 



Signed-off-by: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 4abff077

include/linux/netfilter_arp/arp_tables.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 


#define ARPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN

#define ARPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN

#define arpt_target xt_target



#define ARPT_DEV_ADDR_LEN_MAX 16

net/ipv4/netfilter/arp_tables.c

+4 −4
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static inline int check_entry(struct arpt_entry *e, const char *name) 
static inline int check_target(struct arpt_entry *e, const char *name)

{

	struct arpt_entry_target *t;

	struct arpt_target *target;

	struct xt_target *target;

	int ret;



	t = arpt_get_target(e);
@@ -480,7 +480,7 @@ find_check_entry(struct arpt_entry *e, const char *name, unsigned int size, 
		 unsigned int *i)

{

	struct arpt_entry_target *t;

	struct arpt_target *target;

	struct xt_target *target;

	int ret;



	ret = check_entry(e, name);
@@ -1784,7 +1784,7 @@ void arpt_unregister_table(struct xt_table *table) 
}



/* The built-in targets: standard (NULL) and error. */

static struct arpt_target arpt_standard_target __read_mostly = {

static struct xt_target arpt_standard_target __read_mostly = {

	.name		= ARPT_STANDARD_TARGET,

	.targetsize	= sizeof(int),

	.family		= NF_ARP,
@@ -1795,7 +1795,7 @@ static struct arpt_target arpt_standard_target __read_mostly = { 
#endif

};



static struct arpt_target arpt_error_target __read_mostly = {

static struct xt_target arpt_error_target __read_mostly = {

	.name		= ARPT_ERROR_TARGET,

	.target		= arpt_error,

	.targetsize	= ARPT_FUNCTION_MAXNAMELEN,

net/ipv4/netfilter/arpt_mangle.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ checkentry(const char *tablename, const void *e, const struct xt_target *target, 
	return true;

}



static struct arpt_target arpt_mangle_reg __read_mostly = {

static struct xt_target arpt_mangle_reg __read_mostly = {

	.name		= "mangle",

	.target		= target,

	.targetsize	= sizeof(struct arpt_mangle),