aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netfilter_arp
diff options
context:
space:
mode:
authorDmitry Mishin <dim@openvz.org>2006-03-22 13:56:56 -0800
committerDavid S. Miller <davem@davemloft.net>2006-03-22 13:56:56 -0800
commit1e30a014e311e627b91489ff5ec1b54496d308af (patch)
tree9f61f077f0403ff3aad393d929b07b6af7bdf7f8 /include/linux/netfilter_arp
parent[NETFILTER]: Fix xt_policy address matching (diff)
downloadlinux-dev-1e30a014e311e627b91489ff5ec1b54496d308af.tar.xz
linux-dev-1e30a014e311e627b91489ff5ec1b54496d308af.zip
[NETFILTER]: futher {ip,ip6,arp}_tables unification
This patch moves {ip,ip6,arp}t_entry_{match,target} definitions to x_tables.h. This move simplifies code and future compatibility fixes. Signed-off-by: Dmitry Mishin <dim@openvz.org> Acked-off-by: Kirill Korotaev <dev@openvz.org> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netfilter_arp')
-rw-r--r--include/linux/netfilter_arp/arp_tables.h31
1 files changed, 2 insertions, 29 deletions
diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h
index a27be05f67f0..62cc27daca4e 100644
--- a/include/linux/netfilter_arp/arp_tables.h
+++ b/include/linux/netfilter_arp/arp_tables.h
@@ -65,35 +65,8 @@ struct arpt_arp {
u_int16_t invflags;
};
-struct arpt_entry_target
-{
- union {
- struct {
- u_int16_t target_size;
-
- /* Used by userspace */
- char name[ARPT_FUNCTION_MAXNAMELEN-1];
- u_int8_t revision;
- } user;
- struct {
- u_int16_t target_size;
-
- /* Used inside the kernel */
- struct arpt_target *target;
- } kernel;
-
- /* Total length */
- u_int16_t target_size;
- } u;
-
- unsigned char data[0];
-};
-
-struct arpt_standard_target
-{
- struct arpt_entry_target target;
- int verdict;
-};
+#define arpt_entry_target xt_entry_target
+#define arpt_standard_target xt_standard_target
/* Values for "flag" field in struct arpt_ip (general arp structure).
* No flags defined yet.