netfilter: change Ebtables function signatures to match Xtables's

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>

1 files changed, 10 insertions, 7 deletions

diff --git a/net/bridge/netfilter/ebt_snat.c b/net/bridge/netfilter/ebt_snat.c
index 0e83de781c0..363d0051e04 100644
--- a/net/bridge/netfilter/ebt_snat.c
+++ b/net/bridge/netfilter/ebt_snat.c
@@ -16,9 +16,10 @@
 #include <linux/netfilter_bridge/ebtables.h>
 #include <linux/netfilter_bridge/ebt_nat.h>
 
-static unsigned int ebt_target_snat(struct sk_buff *skb, unsigned int hooknr,
-   const struct net_device *in, const struct net_device *out,
-   const void *data, unsigned int datalen)
+static unsigned int
+ebt_snat_tg(struct sk_buff *skb, const struct net_device *in,
+            const struct net_device *out, unsigned int hook_nr,
+            const struct xt_target *target, const void *data)
 {
         const struct ebt_nat_info *info = data;
 
@@ -43,8 +44,10 @@ out:
         return info->target | ~EBT_VERDICT_BITS;
 }
 
-static bool ebt_target_snat_check(const char *tablename, unsigned int hookmask,
-   const struct ebt_entry *e, void *data, unsigned int datalen)
+static bool
+ebt_snat_tg_check(const char *tablename, const void *e,
+                  const struct xt_target *target, void *data,
+                  unsigned int hookmask)
 {
         const struct ebt_nat_info *info = data;
         int tmp;
@@ -70,8 +73,8 @@ static struct ebt_target snat __read_mostly = {
         .name           = EBT_SNAT_TARGET,
         .revision       = 0,
         .family         = NFPROTO_BRIDGE,
-        .target         = ebt_target_snat,
-        .check          = ebt_target_snat_check,
+        .target         = ebt_snat_tg,
+        .checkentry     = ebt_snat_tg_check,
         .targetsize     = XT_ALIGN(sizeof(struct ebt_nat_info)),
         .me             = THIS_MODULE,
 };