netfilter: xtables: move extension arguments into compound structure (4/6)

[linux-2.6-microblaze.git] / net / netfilter / xt_NFLOG.c

diff --git a/net/netfilter/xt_NFLOG.c b/net/netfilter/xt_NFLOG.c
index 19ae8ef..3218ad6 100644 (file)
--- a/net/netfilter/xt_NFLOG.c
+++ b/net/netfilter/xt_NFLOG.c
@@ -21,11 +21,9 @@ MODULE_ALIAS("ipt_NFLOG");
 MODULE_ALIAS("ip6t_NFLOG");
 
 static unsigned int
-nflog_tg(struct sk_buff *skb, const struct net_device *in,
-         const struct net_device *out, unsigned int hooknum,
-         const struct xt_target *target, const void *targinfo)
+nflog_tg(struct sk_buff *skb, const struct xt_target_param *par)
 {
-       const struct xt_nflog_info *info = targinfo;
+       const struct xt_nflog_info *info = par->targinfo;
        struct nf_loginfo li;
 
        li.type              = NF_LOG_TYPE_ULOG;
@@ -33,8 +31,8 @@ nflog_tg(struct sk_buff *skb, const struct net_device *in,
        li.u.ulog.group      = info->group;
        li.u.ulog.qthreshold = info->threshold;
 
-       nf_log_packet(target->family, hooknum, skb, in, out, &li,
-                     "%s", info->prefix);
+       nf_log_packet(par->target->family, par->hooknum, skb, par->in,
+                     par->out, &li, "%s", info->prefix);
        return XT_CONTINUE;
 }
 
@@ -55,7 +53,7 @@ nflog_tg_check(const char *tablename, const void *entry,
 static struct xt_target nflog_tg_reg[] __read_mostly = {
        {
                .name           = "NFLOG",
-               .family         = AF_INET,
+               .family         = NFPROTO_IPV4,
                .checkentry     = nflog_tg_check,
                .target         = nflog_tg,
                .targetsize     = sizeof(struct xt_nflog_info),
@@ -63,7 +61,7 @@ static struct xt_target nflog_tg_reg[] __read_mostly = {
        },
        {
                .name           = "NFLOG",
-               .family         = AF_INET6,
+               .family         = NFPROTO_IPV6,
                .checkentry     = nflog_tg_check,
                .target         = nflog_tg,
                .targetsize     = sizeof(struct xt_nflog_info),