Merge git://git.infradead.org/iommu-2.6

[linux-2.6-omap-h63xx.git] / net / bridge / netfilter / ebt_nflog.c

diff --git a/net/bridge/netfilter/ebt_nflog.c b/net/bridge/netfilter/ebt_nflog.c
index 74b4fa0aabc13e52f7a35a5eca5d1ef586c8da3b..2a63d996dd4e149f169324483e1fd7753fec3d34 100644 (file)
--- a/net/bridge/netfilter/ebt_nflog.c
+++ b/net/bridge/netfilter/ebt_nflog.c
@@ -20,11 +20,9 @@
 #include <net/netfilter/nf_log.h>
 
 static unsigned int
-ebt_nflog_tg(struct sk_buff *skb, const struct net_device *in,
-            const struct net_device *out, unsigned int hooknr,
-            const struct xt_target *target, const void *data)
+ebt_nflog_tg(struct sk_buff *skb, const struct xt_target_param *par)
 {
-       const struct ebt_nflog_info *info = data;
+       const struct ebt_nflog_info *info = par->targinfo;
        struct nf_loginfo li;
 
        li.type = NF_LOG_TYPE_ULOG;
@@ -32,16 +30,14 @@ ebt_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(PF_BRIDGE, hooknr, skb, in, out, &li, "%s", info->prefix);
+       nf_log_packet(PF_BRIDGE, par->hooknum, skb, par->in, par->out,
+                     &li, "%s", info->prefix);
        return EBT_CONTINUE;
 }
 
-static bool
-ebt_nflog_tg_check(const char *table, const void *e,
-                  const struct xt_target *target, void *data,
-                  unsigned int hookmask)
+static bool ebt_nflog_tg_check(const struct xt_tgchk_param *par)
 {
-       struct ebt_nflog_info *info = data;
+       struct ebt_nflog_info *info = par->targinfo;
 
        if (info->flags & ~EBT_NFLOG_MASK)
                return false;