netfilter: change Ebtables function signatures to match Xtables's

[firefly-linux-kernel-4.4.55.git] / net / bridge / netfilter / ebt_among.c

diff --git a/net/bridge/netfilter/ebt_among.c b/net/bridge/netfilter/ebt_among.c
index 70b6dca5ea755502a74e294546156a8bea345509..84a306f085b5f4e9e96ed7a41e104a69fe713687 100644 (file)
--- a/net/bridge/netfilter/ebt_among.c
+++ b/net/bridge/netfilter/ebt_among.c
@@ -14,8 +14,8 @@
 #include <linux/if_arp.h>
 #include <linux/module.h>
 
-static int ebt_mac_wormhash_contains(const struct ebt_mac_wormhash *wh,
-                                    const char *mac, __be32 ip)
+static bool ebt_mac_wormhash_contains(const struct ebt_mac_wormhash *wh,
+                                     const char *mac, __be32 ip)
 {
        /* You may be puzzled as to how this code works.
         * Some tricks were used, refer to
@@ -33,23 +33,19 @@ static int ebt_mac_wormhash_contains(const struct ebt_mac_wormhash *wh,
        if (ip) {
                for (i = start; i < limit; i++) {
                        p = &wh->pool[i];
-                       if (cmp[1] == p->cmp[1] && cmp[0] == p->cmp[0]) {
-                               if (p->ip == 0 || p->ip == ip) {
-                                       return 1;
-                               }
-                       }
+                       if (cmp[1] == p->cmp[1] && cmp[0] == p->cmp[0])
+                               if (p->ip == 0 || p->ip == ip)
+                                       return true;
                }
        } else {
                for (i = start; i < limit; i++) {
                        p = &wh->pool[i];
-                       if (cmp[1] == p->cmp[1] && cmp[0] == p->cmp[0]) {
-                               if (p->ip == 0) {
-                                       return 1;
-                               }
-                       }
+                       if (cmp[1] == p->cmp[1] && cmp[0] == p->cmp[0])
+                               if (p->ip == 0)
+                                       return true;
                }
        }
-       return 0;
+       return false;
 }
 
 static int ebt_mac_wormhash_check_integrity(const struct ebt_mac_wormhash
@@ -131,10 +127,10 @@ static int get_ip_src(const struct sk_buff *skb, __be32 *addr)
        return 0;
 }
 
-static int ebt_filter_among(const struct sk_buff *skb,
-                           const struct net_device *in,
-                           const struct net_device *out, const void *data,
-                           unsigned int datalen)
+static bool
+ebt_among_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_among_info *info = data;
        const char *dmac, *smac;
@@ -147,40 +143,43 @@ static int ebt_filter_among(const struct sk_buff *skb,
        if (wh_src) {
                smac = eth_hdr(skb)->h_source;
                if (get_ip_src(skb, &sip))
-                       return EBT_NOMATCH;
+                       return false;
                if (!(info->bitmask & EBT_AMONG_SRC_NEG)) {
                        /* we match only if it contains */
                        if (!ebt_mac_wormhash_contains(wh_src, smac, sip))
-                               return EBT_NOMATCH;
+                               return false;
                } else {
                        /* we match only if it DOES NOT contain */
                        if (ebt_mac_wormhash_contains(wh_src, smac, sip))
-                               return EBT_NOMATCH;
+                               return false;
                }
        }
 
        if (wh_dst) {
                dmac = eth_hdr(skb)->h_dest;
                if (get_ip_dst(skb, &dip))
-                       return EBT_NOMATCH;
+                       return false;
                if (!(info->bitmask & EBT_AMONG_DST_NEG)) {
                        /* we match only if it contains */
                        if (!ebt_mac_wormhash_contains(wh_dst, dmac, dip))
-                               return EBT_NOMATCH;
+                               return false;
                } else {
                        /* we match only if it DOES NOT contain */
                        if (ebt_mac_wormhash_contains(wh_dst, dmac, dip))
-                               return EBT_NOMATCH;
+                               return false;
                }
        }
 
-       return EBT_MATCH;
+       return true;
 }
 
-static int ebt_among_check(const char *tablename, unsigned int hookmask,
-                          const struct ebt_entry *e, void *data,
-                          unsigned int datalen)
+static bool
+ebt_among_mt_check(const char *table, const void *entry,
+                  const struct xt_match *match, void *data,
+                  unsigned int hook_mask)
 {
+       const struct ebt_entry_match *em =
+               container_of(data, const struct ebt_entry_match, data);
        const struct ebt_among_info *info = data;
        int expected_length = sizeof(struct ebt_among_info);
        const struct ebt_mac_wormhash *wh_dst, *wh_src;
@@ -191,31 +190,34 @@ static int ebt_among_check(const char *tablename, unsigned int hookmask,
        expected_length += ebt_mac_wormhash_size(wh_dst);
        expected_length += ebt_mac_wormhash_size(wh_src);
 
-       if (datalen != EBT_ALIGN(expected_length)) {
+       if (em->match_size != EBT_ALIGN(expected_length)) {
                printk(KERN_WARNING
                       "ebtables: among: wrong size: %d "
                       "against expected %d, rounded to %Zd\n",
-                      datalen, expected_length,
+                      em->match_size, expected_length,
                       EBT_ALIGN(expected_length));
-               return -EINVAL;
+               return false;
        }
        if (wh_dst && (err = ebt_mac_wormhash_check_integrity(wh_dst))) {
                printk(KERN_WARNING
                       "ebtables: among: dst integrity fail: %x\n", -err);
-               return -EINVAL;
+               return false;
        }
        if (wh_src && (err = ebt_mac_wormhash_check_integrity(wh_src))) {
                printk(KERN_WARNING
                       "ebtables: among: src integrity fail: %x\n", -err);
-               return -EINVAL;
+               return false;
        }
-       return 0;
+       return true;
 }
 
 static struct ebt_match filter_among __read_mostly = {
        .name           = EBT_AMONG_MATCH,
-       .match          = ebt_filter_among,
-       .check          = ebt_among_check,
+       .revision       = 0,
+       .family         = NFPROTO_BRIDGE,
+       .match          = ebt_among_mt,
+       .checkentry     = ebt_among_mt_check,
+       .matchsize      = -1, /* special case */
        .me             = THIS_MODULE,
 };