netfilter: change Ebtables function signatures to match Xtables's

[mirror_ubuntu-zesty-kernel.git] / net / bridge / netfilter / ebt_mark_m.c

diff --git a/net/bridge/netfilter/ebt_mark_m.c b/net/bridge/netfilter/ebt_mark_m.c
index 9b0a4543861fc02b148fb95c071db1d9228f8d6d..db64a0de4f741428497b8fc1e3bf46caa508153d 100644 (file)
--- a/net/bridge/netfilter/ebt_mark_m.c
+++ b/net/bridge/netfilter/ebt_mark_m.c
@@ -7,42 +7,46 @@
  *  July, 2002
  *
  */
-
+#include <linux/module.h>
+#include <linux/netfilter/x_tables.h>
 #include <linux/netfilter_bridge/ebtables.h>
 #include <linux/netfilter_bridge/ebt_mark_m.h>
-#include <linux/module.h>
 
-static int ebt_filter_mark(const struct sk_buff *skb,
-   const struct net_device *in, const struct net_device *out, const void *data,
-   unsigned int datalen)
+static bool
+ebt_mark_mt(const struct sk_buff *skb, const struct net_device *in,
+           const struct net_device *out, const struct xt_match *match,
+           const void *data, int offset, unsigned int protoff, bool *hotdrop)
 {
        const struct ebt_mark_m_info *info = data;
 
        if (info->bitmask & EBT_MARK_OR)
-               return !(!!(skb->mark & info->mask) ^ info->invert);
-       return !(((skb->mark & info->mask) == info->mark) ^ info->invert);
+               return !!(skb->mark & info->mask) ^ info->invert;
+       return ((skb->mark & info->mask) == info->mark) ^ info->invert;
 }
 
-static int ebt_mark_check(const char *tablename, unsigned int hookmask,
-   const struct ebt_entry *e, void *data, unsigned int datalen)
+static bool
+ebt_mark_mt_check(const char *table, const void *e,
+                 const struct xt_match *match, void *data,
+                 unsigned int hook_mask)
 {
        const struct ebt_mark_m_info *info = data;
 
-       if (datalen != EBT_ALIGN(sizeof(struct ebt_mark_m_info)))
-               return -EINVAL;
        if (info->bitmask & ~EBT_MARK_MASK)
-               return -EINVAL;
+               return false;
        if ((info->bitmask & EBT_MARK_OR) && (info->bitmask & EBT_MARK_AND))
-               return -EINVAL;
+               return false;
        if (!info->bitmask)
-               return -EINVAL;
-       return 0;
+               return false;
+       return true;
 }
 
 static struct ebt_match filter_mark __read_mostly = {
        .name           = EBT_MARK_MATCH,
-       .match          = ebt_filter_mark,
-       .check          = ebt_mark_check,
+       .revision       = 0,
+       .family         = NFPROTO_BRIDGE,
+       .match          = ebt_mark_mt,
+       .checkentry     = ebt_mark_mt_check,
+       .matchsize      = XT_ALIGN(sizeof(struct ebt_mark_m_info)),
        .me             = THIS_MODULE,
 };