netfilter: xtables: change matches to return error code

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / bridge / netfilter / ebt_vlan.c

diff --git a/net/bridge/netfilter/ebt_vlan.c b/net/bridge/netfilter/ebt_vlan.c
index 04a9575389d82057cef69230c140e6a32c284d8c..bf8ae5c7a0c5501fcc4f583a5a984511519b951c 100644 (file)
--- a/net/bridge/netfilter/ebt_vlan.c
+++ b/net/bridge/netfilter/ebt_vlan.c
@@ -88,7 +88,7 @@ static int ebt_vlan_mt_check(const struct xt_mtchk_param *par)
        if (e->ethproto != htons(ETH_P_8021Q)) {
                pr_debug("passed entry proto %2.4X is not 802.1Q (8100)\n",
                         ntohs(e->ethproto));
-               return false;
+               return -EINVAL;
        }
 
        /* Check for bitmask range
@@ -96,14 +96,14 @@ static int ebt_vlan_mt_check(const struct xt_mtchk_param *par)
        if (info->bitmask & ~EBT_VLAN_MASK) {
                pr_debug("bitmask %2X is out of mask (%2X)\n",
                         info->bitmask, EBT_VLAN_MASK);
-               return false;
+               return -EINVAL;
        }
 
        /* Check for inversion flags range */
        if (info->invflags & ~EBT_VLAN_MASK) {
                pr_debug("inversion flags %2X is out of mask (%2X)\n",
                         info->invflags, EBT_VLAN_MASK);
-               return false;
+               return -EINVAL;
        }
 
        /* Reserved VLAN ID (VID) values
@@ -117,7 +117,7 @@ static int ebt_vlan_mt_check(const struct xt_mtchk_param *par)
                        if (info->id > VLAN_GROUP_ARRAY_LEN) {
                                pr_debug("id %d is out of range (1-4096)\n",
                                         info->id);
-                               return false;
+                               return -EINVAL;
                        }
                        /* Note: This is valid VLAN-tagged frame point.
                         * Any value of user_priority are acceptable,
@@ -132,7 +132,7 @@ static int ebt_vlan_mt_check(const struct xt_mtchk_param *par)
                if ((unsigned char) info->prio > 7) {
                        pr_debug("prio %d is out of range (0-7)\n",
                                 info->prio);
-                       return false;
+                       return -EINVAL;
                }
        }
        /* Check for encapsulated proto range - it is possible to be
@@ -142,11 +142,11 @@ static int ebt_vlan_mt_check(const struct xt_mtchk_param *par)
                if ((unsigned short) ntohs(info->encap) < ETH_ZLEN) {
                        pr_debug("encap frame length %d is less than "
                                 "minimal\n", ntohs(info->encap));
-                       return false;
+                       return -EINVAL;
                }
        }
 
-       return true;
+       return 0;
 }
 
 static struct xt_match ebt_vlan_mt_reg __read_mostly = {