netfilter: xtables: change matches to return error code

[pandora-kernel.git] / net / bridge / netfilter / ebt_pkttype.c

diff --git a/net/bridge/netfilter/ebt_pkttype.c b/net/bridge/netfilter/ebt_pkttype.c
index 883e96e..f34bcc3 100644 (file)
--- a/net/bridge/netfilter/ebt_pkttype.c
+++ b/net/bridge/netfilter/ebt_pkttype.c
@@ -20,14 +20,14 @@ ebt_pkttype_mt(const struct sk_buff *skb, const struct xt_match_param *par)
        return (skb->pkt_type == info->pkt_type) ^ info->invert;
 }
 
-static bool ebt_pkttype_mt_check(const struct xt_mtchk_param *par)
+static int ebt_pkttype_mt_check(const struct xt_mtchk_param *par)
 {
        const struct ebt_pkttype_info *info = par->matchinfo;
 
        if (info->invert != 0 && info->invert != 1)
-               return false;
+               return -EINVAL;
        /* Allow any pkt_type value */
-       return true;
+       return 0;
 }
 
 static struct xt_match ebt_pkttype_mt_reg __read_mostly = {
@@ -36,7 +36,7 @@ static struct xt_match ebt_pkttype_mt_reg __read_mostly = {
        .family         = NFPROTO_BRIDGE,
        .match          = ebt_pkttype_mt,
        .checkentry     = ebt_pkttype_mt_check,
-       .matchsize      = XT_ALIGN(sizeof(struct ebt_pkttype_info)),
+       .matchsize      = sizeof(struct ebt_pkttype_info),
        .me             = THIS_MODULE,
 };