[NETFILTER]: {ip,ip6}_tables: remove x_tables wrapper functions

[deliverable/linux.git] / net / ipv4 / netfilter / ipt_LOG.c

diff --git a/net/ipv4/netfilter/ipt_LOG.c b/net/ipv4/netfilter/ipt_LOG.c
index 37778c72aeaaedc3beb987c89c8194cdb42a0951..f68370ffb43f22e286d03dbd67962965924676d4 100644 (file)
--- a/net/ipv4/netfilter/ipt_LOG.c
+++ b/net/ipv4/netfilter/ipt_LOG.c
@@ -20,7 +20,7 @@
 #include <net/route.h>
 
 #include <linux/netfilter.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
+#include <linux/netfilter/x_tables.h>
 #include <linux/netfilter_ipv4/ipt_LOG.h>
 
 MODULE_LICENSE("GPL");
@@ -432,7 +432,7 @@ ipt_log_target(struct sk_buff **pskb,
 
        ipt_log_packet(PF_INET, hooknum, *pskb, in, out, &li,
                       loginfo->prefix);
-       return IPT_CONTINUE;
+       return XT_CONTINUE;
 }
 
 static int ipt_log_checkentry(const char *tablename,
@@ -455,8 +455,9 @@ static int ipt_log_checkentry(const char *tablename,
        return 1;
 }
 
-static struct ipt_target ipt_log_reg = {
+static struct xt_target ipt_log_reg = {
        .name           = "LOG",
+       .family         = AF_INET,
        .target         = ipt_log_target,
        .targetsize     = sizeof(struct ipt_log_info),
        .checkentry     = ipt_log_checkentry,
@@ -473,7 +474,7 @@ static int __init ipt_log_init(void)
 {
        int ret;
 
-       ret = ipt_register_target(&ipt_log_reg);
+       ret = xt_register_target(&ipt_log_reg);
        if (ret < 0)
                return ret;
        if (nf_log_register(PF_INET, &ipt_log_logger) < 0) {
@@ -489,7 +490,7 @@ static int __init ipt_log_init(void)
 static void __exit ipt_log_fini(void)
 {
        nf_log_unregister_logger(&ipt_log_logger);
-       ipt_unregister_target(&ipt_log_reg);
+       xt_unregister_target(&ipt_log_reg);
 }
 
 module_init(ipt_log_init);