Skip to content

L
linux
Commit 4abff077 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy
Browse files
Options

[NETFILTER]: remove arpt_table indirection macro 

Signed-off-by: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 72b72949
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 21 deletions
include/linux/netfilter_arp/arp_tables.h
View file @ 4abff077
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,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_target xt_target
#define arpt_table xt_table
#define ARPT_DEV_ADDR_LEN_MAX 16 #define ARPT_DEV_ADDR_LEN_MAX 16
...@@ -271,15 +270,15 @@ struct arpt_error ...@@ -271,15 +270,15 @@ struct arpt_error
xt_register_target(tgt); }) xt_register_target(tgt); })
#define arpt_unregister_target(tgt) xt_unregister_target(tgt) #define arpt_unregister_target(tgt) xt_unregister_target(tgt)
extern struct arpt_table *arpt_register_table(struct net *net, extern struct xt_table *arpt_register_table(struct net *net,
struct arpt_table *table, struct xt_table *table,
const struct arpt_replace *repl); const struct arpt_replace *repl);
extern void arpt_unregister_table(struct arpt_table *table); extern void arpt_unregister_table(struct xt_table *table);
extern unsigned int arpt_do_table(struct sk_buff *skb, extern unsigned int arpt_do_table(struct sk_buff *skb,
unsigned int hook, unsigned int hook,
const struct net_device *in, const struct net_device *in,
const struct net_device *out, const struct net_device *out,
struct arpt_table *table); struct xt_table *table);
#define ARPT_ALIGN(s) XT_ALIGN(s) #define ARPT_ALIGN(s) XT_ALIGN(s)
......
net/ipv4/netfilter/arp_tables.c
View file @ 4abff077
...@@ -222,7 +222,7 @@ unsigned int arpt_do_table(struct sk_buff *skb, ...@@ -222,7 +222,7 @@ unsigned int arpt_do_table(struct sk_buff *skb,
unsigned int hook, unsigned int hook,
const struct net_device *in, const struct net_device *in,
const struct net_device *out, const struct net_device *out,
struct arpt_table *table) struct xt_table *table)
{ {
static const char nulldevname[IFNAMSIZ]; static const char nulldevname[IFNAMSIZ];
unsigned int verdict = NF_DROP; unsigned int verdict = NF_DROP;
...@@ -706,7 +706,7 @@ static void get_counters(const struct xt_table_info *t, ...@@ -706,7 +706,7 @@ static void get_counters(const struct xt_table_info *t,
} }
} }
static inline struct xt_counters *alloc_counters(struct arpt_table *table) static inline struct xt_counters *alloc_counters(struct xt_table *table)
{ {
unsigned int countersize; unsigned int countersize;
struct xt_counters *counters; struct xt_counters *counters;
...@@ -731,13 +731,13 @@ static inline struct xt_counters *alloc_counters(struct arpt_table *table) ...@@ -731,13 +731,13 @@ static inline struct xt_counters *alloc_counters(struct arpt_table *table)
} }
static int copy_entries_to_user(unsigned int total_size, static int copy_entries_to_user(unsigned int total_size,
struct arpt_table *table, struct xt_table *table,
void __user *userptr) void __user *userptr)
{ {
unsigned int off, num; unsigned int off, num;
struct arpt_entry *e; struct arpt_entry *e;
struct xt_counters *counters; struct xt_counters *counters;
const struct xt_table_info *private = table->private; struct xt_table_info *private = table->private;
int ret = 0; int ret = 0;
void *loc_cpu_entry; void *loc_cpu_entry;
...@@ -851,7 +851,7 @@ static int compat_table_info(const struct xt_table_info *info, ...@@ -851,7 +851,7 @@ static int compat_table_info(const struct xt_table_info *info,
static int get_info(struct net *net, void __user *user, int *len, int compat) static int get_info(struct net *net, void __user *user, int *len, int compat)
{ {
char name[ARPT_TABLE_MAXNAMELEN]; char name[ARPT_TABLE_MAXNAMELEN];
struct arpt_table *t; struct xt_table *t;
int ret; int ret;
if (*len != sizeof(struct arpt_getinfo)) { if (*len != sizeof(struct arpt_getinfo)) {
...@@ -911,7 +911,7 @@ static int get_entries(struct net *net, struct arpt_get_entries __user *uptr, ...@@ -911,7 +911,7 @@ static int get_entries(struct net *net, struct arpt_get_entries __user *uptr,
{ {
int ret; int ret;
struct arpt_get_entries get; struct arpt_get_entries get;
struct arpt_table *t; struct xt_table *t;
if (*len < sizeof(get)) { if (*len < sizeof(get)) {
duprintf("get_entries: %u < %Zu\n", *len, sizeof(get)); duprintf("get_entries: %u < %Zu\n", *len, sizeof(get));
...@@ -954,7 +954,7 @@ static int __do_replace(struct net *net, const char *name, ...@@ -954,7 +954,7 @@ static int __do_replace(struct net *net, const char *name,
void __user *counters_ptr) void __user *counters_ptr)
{ {
int ret; int ret;
struct arpt_table *t; struct xt_table *t;
struct xt_table_info *oldinfo; struct xt_table_info *oldinfo;
struct xt_counters *counters; struct xt_counters *counters;
void *loc_cpu_old_entry; void *loc_cpu_old_entry;
...@@ -1091,7 +1091,7 @@ static int do_add_counters(struct net *net, void __user *user, unsigned int len, ...@@ -1091,7 +1091,7 @@ static int do_add_counters(struct net *net, void __user *user, unsigned int len,
const char *name; const char *name;
int size; int size;
void *ptmp; void *ptmp;
struct arpt_table *t; struct xt_table *t;
const struct xt_table_info *private; const struct xt_table_info *private;
int ret = 0; int ret = 0;
void *loc_cpu_entry; void *loc_cpu_entry;
...@@ -1555,7 +1555,7 @@ static int compat_copy_entry_to_user(struct arpt_entry *e, void __user **dstptr, ...@@ -1555,7 +1555,7 @@ static int compat_copy_entry_to_user(struct arpt_entry *e, void __user **dstptr,
} }
static int compat_copy_entries_to_user(unsigned int total_size, static int compat_copy_entries_to_user(unsigned int total_size,
struct arpt_table *table, struct xt_table *table,
void __user *userptr) void __user *userptr)
{ {
struct xt_counters *counters; struct xt_counters *counters;
...@@ -1593,7 +1593,7 @@ static int compat_get_entries(struct net *net, ...@@ -1593,7 +1593,7 @@ static int compat_get_entries(struct net *net,
{ {
int ret; int ret;
struct compat_arpt_get_entries get; struct compat_arpt_get_entries get;
struct arpt_table *t; struct xt_table *t;
if (*len < sizeof(get)) { if (*len < sizeof(get)) {
duprintf("compat_get_entries: %u < %zu\n", *len, sizeof(get)); duprintf("compat_get_entries: %u < %zu\n", *len, sizeof(get));
...@@ -1723,8 +1723,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len ...@@ -1723,8 +1723,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
return ret; return ret;
} }
struct arpt_table *arpt_register_table(struct net *net, struct xt_table *arpt_register_table(struct net *net, struct xt_table *table,
struct arpt_table *table,
const struct arpt_replace *repl) const struct arpt_replace *repl)
{ {
int ret; int ret;
...@@ -1767,7 +1766,7 @@ struct arpt_table *arpt_register_table(struct net *net, ...@@ -1767,7 +1766,7 @@ struct arpt_table *arpt_register_table(struct net *net,
return ERR_PTR(ret); return ERR_PTR(ret);
} }
void arpt_unregister_table(struct arpt_table *table) void arpt_unregister_table(struct xt_table *table)
{ {
struct xt_table_info *private; struct xt_table_info *private;
void *loc_cpu_entry; void *loc_cpu_entry;
......
net/ipv4/netfilter/arptable_filter.c
View file @ 4abff077
...@@ -45,7 +45,7 @@ static struct ...@@ -45,7 +45,7 @@ static struct
.term = ARPT_ERROR_INIT, .term = ARPT_ERROR_INIT,
}; };
static struct arpt_table packet_filter = { static struct xt_table packet_filter = {
.name = "filter", .name = "filter",
.valid_hooks = FILTER_VALID_HOOKS, .valid_hooks = FILTER_VALID_HOOKS,
.lock = __RW_LOCK_UNLOCKED(packet_filter.lock), .lock = __RW_LOCK_UNLOCKED(packet_filter.lock),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7