lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETFILTER]: remove arpt_target indirection macro

Browse Source 
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
Jan Engelhardt
2008-04-14 11:15:43 +02:00
committed by Patrick McHardy
parent 4abff0775d
commit 95eea855af
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/netfilter_arp/arp_tables.h
View File

@@ -23,7 +23,6 @@
#define ARPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN #define ARPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN
#define ARPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN #define ARPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN
#define arpt_target xt_target
#define ARPT_DEV_ADDR_LEN_MAX 16 #define ARPT_DEV_ADDR_LEN_MAX 16

8
net/ipv4/netfilter/arp_tables.c
View File

@@ -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) static inline int check_target(struct arpt_entry *e, const char *name)
{ {
struct arpt_entry_target *t; struct arpt_entry_target *t;
struct arpt_target *target; struct xt_target *target;
int ret; int ret;
t = arpt_get_target(e); 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) unsigned int *i)
{ {
struct arpt_entry_target *t; struct arpt_entry_target *t;
struct arpt_target *target; struct xt_target *target;
int ret; int ret;
ret = check_entry(e, name); 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. */ /* 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, .name = ARPT_STANDARD_TARGET,
.targetsize = sizeof(int), .targetsize = sizeof(int),
.family = NF_ARP, .family = NF_ARP,
@@ -1795,7 +1795,7 @@ static struct arpt_target arpt_standard_target __read_mostly = {
#endif #endif
}; };
static struct arpt_target arpt_error_target __read_mostly = { static struct xt_target arpt_error_target __read_mostly = {
.name = ARPT_ERROR_TARGET, .name = ARPT_ERROR_TARGET,
.target = arpt_error, .target = arpt_error,
.targetsize = ARPT_FUNCTION_MAXNAMELEN, .targetsize = ARPT_FUNCTION_MAXNAMELEN,

2
net/ipv4/netfilter/arpt_mangle.c
View File

@@ -73,7 +73,7 @@ checkentry(const char *tablename, const void *e, const struct xt_target *target,
return true; return true;
} }
static struct arpt_target arpt_mangle_reg __read_mostly = { static struct xt_target arpt_mangle_reg __read_mostly = {
.name = "mangle", .name = "mangle",
.target = target, .target = target,
.targetsize = sizeof(struct arpt_mangle), .targetsize = sizeof(struct arpt_mangle),