aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@computergmbh.de>2008-04-14 05:15:43 -0400
committerPatrick McHardy <kaber@trash.net>2008-04-14 05:15:43 -0400
commit95eea855af69bfd54a7b73546190e76046ca2e07 (patch)
tree264951aad652625a31e12f715363ee07d00f3639 /net/ipv4
parent4abff0775d5e4feb20b21371e1c63a1b30fc2140 (diff)
[NETFILTER]: remove arpt_target indirection macro
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de> Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/netfilter/arp_tables.c8
-rw-r--r--net/ipv4/netfilter/arpt_mangle.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
index 34c42c831b18..d55f3b42eba5 100644
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -457,7 +457,7 @@ static inline int check_entry(struct arpt_entry *e, const char *name)
457static inline int check_target(struct arpt_entry *e, const char *name) 457static inline int check_target(struct arpt_entry *e, const char *name)
458{ 458{
459 struct arpt_entry_target *t; 459 struct arpt_entry_target *t;
460 struct arpt_target *target; 460 struct xt_target *target;
461 int ret; 461 int ret;
462 462
463 t = arpt_get_target(e); 463 t = arpt_get_target(e);
@@ -480,7 +480,7 @@ find_check_entry(struct arpt_entry *e, const char *name, unsigned int size,
480 unsigned int *i) 480 unsigned int *i)
481{ 481{
482 struct arpt_entry_target *t; 482 struct arpt_entry_target *t;
483 struct arpt_target *target; 483 struct xt_target *target;
484 int ret; 484 int ret;
485 485
486 ret = check_entry(e, name); 486 ret = check_entry(e, name);
@@ -1784,7 +1784,7 @@ void arpt_unregister_table(struct xt_table *table)
1784} 1784}
1785 1785
1786/* The built-in targets: standard (NULL) and error. */ 1786/* The built-in targets: standard (NULL) and error. */
1787static struct arpt_target arpt_standard_target __read_mostly = { 1787static struct xt_target arpt_standard_target __read_mostly = {
1788 .name = ARPT_STANDARD_TARGET, 1788 .name = ARPT_STANDARD_TARGET,
1789 .targetsize = sizeof(int), 1789 .targetsize = sizeof(int),
1790 .family = NF_ARP, 1790 .family = NF_ARP,
@@ -1795,7 +1795,7 @@ static struct arpt_target arpt_standard_target __read_mostly = {
1795#endif 1795#endif
1796}; 1796};
1797 1797
1798static struct arpt_target arpt_error_target __read_mostly = { 1798static struct xt_target arpt_error_target __read_mostly = {
1799 .name = ARPT_ERROR_TARGET, 1799 .name = ARPT_ERROR_TARGET,
1800 .target = arpt_error, 1800 .target = arpt_error,
1801 .targetsize = ARPT_FUNCTION_MAXNAMELEN, 1801 .targetsize = ARPT_FUNCTION_MAXNAMELEN,
diff --git a/net/ipv4/netfilter/arpt_mangle.c b/net/ipv4/netfilter/arpt_mangle.c
index 3e732c827fc2..f9c102ab891b 100644
--- a/net/ipv4/netfilter/arpt_mangle.c
+++ b/net/ipv4/netfilter/arpt_mangle.c
@@ -73,7 +73,7 @@ checkentry(const char *tablename, const void *e, const struct xt_target *target,
73 return true; 73 return true;
74} 74}
75 75
76static struct arpt_target arpt_mangle_reg __read_mostly = { 76static struct xt_target arpt_mangle_reg __read_mostly = {
77 .name = "mangle", 77 .name = "mangle",
78 .target = target, 78 .target = target,
79 .targetsize = sizeof(struct arpt_mangle), 79 .targetsize = sizeof(struct arpt_mangle),