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

Commit 9934e81c authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: ip6_tables: remove redundant structure definitions 



Move ip6t_standard/ip6t_error_target/ip6t_error definitions to ip6_tables.h
instead of defining them in each table individually.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c3e79c05

include/linux/netfilter_ipv6/ip6_tables.h

+19 −0
Original line number Diff line number Diff line
@@ -104,6 +104,25 @@ struct ip6t_entry 
	unsigned char elems[0];

};



/* Standard entry */

struct ip6t_standard

{

	struct ip6t_entry entry;

	struct ip6t_standard_target target;

};



struct ip6t_error_target

{

	struct ip6t_entry_target target;

	char errorname[IP6T_FUNCTION_MAXNAMELEN];

};



struct ip6t_error

{

	struct ip6t_entry entry;

	struct ip6t_error_target target;

};



/*

 * New IP firewall options for [gs]etsockopt at the RAW IP level.

 * Unlike BSD Linux inherits IP options so you don't have to use

net/ipv6/netfilter/ip6table_filter.c

+0 −19
Original line number Diff line number Diff line
@@ -19,25 +19,6 @@ MODULE_DESCRIPTION("ip6tables filter table"); 


#define FILTER_VALID_HOOKS ((1 << NF_IP6_LOCAL_IN) | (1 << NF_IP6_FORWARD) | (1 << NF_IP6_LOCAL_OUT))



/* Standard entry. */

struct ip6t_standard

{

	struct ip6t_entry entry;

	struct ip6t_standard_target target;

};



struct ip6t_error_target

{

	struct ip6t_entry_target target;

	char errorname[IP6T_FUNCTION_MAXNAMELEN];

};



struct ip6t_error

{

	struct ip6t_entry entry;

	struct ip6t_error_target target;

};



static struct

{

	struct ip6t_replace repl;

net/ipv6/netfilter/ip6table_mangle.c

+0 −19
Original line number Diff line number Diff line
@@ -29,25 +29,6 @@ MODULE_DESCRIPTION("ip6tables mangle table"); 
#define DEBUGP(x, args...)

#endif



/* Standard entry. */

struct ip6t_standard

{

	struct ip6t_entry entry;

	struct ip6t_standard_target target;

};



struct ip6t_error_target

{

	struct ip6t_entry_target target;

	char errorname[IP6T_FUNCTION_MAXNAMELEN];

};



struct ip6t_error

{

	struct ip6t_entry entry;

	struct ip6t_error_target target;

};



static struct

{

	struct ip6t_replace repl;

net/ipv6/netfilter/ip6table_raw.c

+0 −19
Original line number Diff line number Diff line
@@ -14,25 +14,6 @@ 
#define DEBUGP(x, args...)

#endif



/* Standard entry. */

struct ip6t_standard

{

	struct ip6t_entry entry;

	struct ip6t_standard_target target;

};



struct ip6t_error_target

{

	struct ip6t_entry_target target;

	char errorname[IP6T_FUNCTION_MAXNAMELEN];

};



struct ip6t_error

{

	struct ip6t_entry entry;

	struct ip6t_error_target target;

};



static struct

{

	struct ip6t_replace repl;