Documentation: Replace obsolete "driverfs" with "sysfs".

[linux-2.6-omap-h63xx.git] / net / netfilter / xt_physdev.c

diff --git a/net/netfilter/xt_physdev.c b/net/netfilter/xt_physdev.c
index 35a0fe200c397c509d256dddd23cc8d57e3d3338..a4bab043a6d1b185122a108ec3ae27fa6b776db6 100644 (file)
--- a/net/netfilter/xt_physdev.c
+++ b/net/netfilter/xt_physdev.c
@@ -13,9 +13,6 @@
 #include <linux/netfilter_bridge.h>
 #include <linux/netfilter/xt_physdev.h>
 #include <linux/netfilter/x_tables.h>
-#include <linux/netfilter_bridge.h>
-#define MATCH   1
-#define NOMATCH 0
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Bart De Schuymer <bdschuym@pandora.be>");
@@ -23,7 +20,7 @@ MODULE_DESCRIPTION("iptables bridge physical device match module");
 MODULE_ALIAS("ipt_physdev");
 MODULE_ALIAS("ip6t_physdev");
 
-static int
+static bool
 match(const struct sk_buff *skb,
       const struct net_device *in,
       const struct net_device *out,
@@ -31,14 +28,14 @@ match(const struct sk_buff *skb,
       const void *matchinfo,
       int offset,
       unsigned int protoff,
-      int *hotdrop)
+      bool *hotdrop)
 {
        int i;
        static const char nulldevname[IFNAMSIZ];
        const struct xt_physdev_info *info = matchinfo;
-       unsigned int ret;
+       bool ret;
        const char *indev, *outdev;
-       struct nf_bridge_info *nf_bridge;
+       const struct nf_bridge_info *nf_bridge;
 
        /* Not a bridged IP packet or no info available yet:
         * LOCAL_OUT/mangle and LOCAL_OUT/nat don't know if
@@ -47,61 +44,61 @@ match(const struct sk_buff *skb,
                /* Return MATCH if the invert flags of the used options are on */
                if ((info->bitmask & XT_PHYSDEV_OP_BRIDGED) &&
                    !(info->invert & XT_PHYSDEV_OP_BRIDGED))
-                       return NOMATCH;
+                       return false;
                if ((info->bitmask & XT_PHYSDEV_OP_ISIN) &&
                    !(info->invert & XT_PHYSDEV_OP_ISIN))
-                       return NOMATCH;
+                       return false;
                if ((info->bitmask & XT_PHYSDEV_OP_ISOUT) &&
                    !(info->invert & XT_PHYSDEV_OP_ISOUT))
-                       return NOMATCH;
+                       return false;
                if ((info->bitmask & XT_PHYSDEV_OP_IN) &&
                    !(info->invert & XT_PHYSDEV_OP_IN))
-                       return NOMATCH;
+                       return false;
                if ((info->bitmask & XT_PHYSDEV_OP_OUT) &&
                    !(info->invert & XT_PHYSDEV_OP_OUT))
-                       return NOMATCH;
-               return MATCH;
+                       return false;
+               return true;
        }
 
        /* This only makes sense in the FORWARD and POSTROUTING chains */
        if ((info->bitmask & XT_PHYSDEV_OP_BRIDGED) &&
            (!!(nf_bridge->mask & BRNF_BRIDGED) ^
            !(info->invert & XT_PHYSDEV_OP_BRIDGED)))
-               return NOMATCH;
+               return false;
 
        if ((info->bitmask & XT_PHYSDEV_OP_ISIN &&
            (!nf_bridge->physindev ^ !!(info->invert & XT_PHYSDEV_OP_ISIN))) ||
            (info->bitmask & XT_PHYSDEV_OP_ISOUT &&
            (!nf_bridge->physoutdev ^ !!(info->invert & XT_PHYSDEV_OP_ISOUT))))
-               return NOMATCH;
+               return false;
 
        if (!(info->bitmask & XT_PHYSDEV_OP_IN))
                goto match_outdev;
        indev = nf_bridge->physindev ? nf_bridge->physindev->name : nulldevname;
-       for (i = 0, ret = 0; i < IFNAMSIZ/sizeof(unsigned int); i++) {
+       for (i = 0, ret = false; i < IFNAMSIZ/sizeof(unsigned int); i++) {
                ret |= (((const unsigned int *)indev)[i]
                        ^ ((const unsigned int *)info->physindev)[i])
                        & ((const unsigned int *)info->in_mask)[i];
        }
 
-       if ((ret == 0) ^ !(info->invert & XT_PHYSDEV_OP_IN))
-               return NOMATCH;
+       if (!ret ^ !(info->invert & XT_PHYSDEV_OP_IN))
+               return false;
 
 match_outdev:
        if (!(info->bitmask & XT_PHYSDEV_OP_OUT))
-               return MATCH;
+               return true;
        outdev = nf_bridge->physoutdev ?
                 nf_bridge->physoutdev->name : nulldevname;
-       for (i = 0, ret = 0; i < IFNAMSIZ/sizeof(unsigned int); i++) {
+       for (i = 0, ret = false; i < IFNAMSIZ/sizeof(unsigned int); i++) {
                ret |= (((const unsigned int *)outdev)[i]
                        ^ ((const unsigned int *)info->physoutdev)[i])
                        & ((const unsigned int *)info->out_mask)[i];
        }
 
-       return (ret != 0) ^ !(info->invert & XT_PHYSDEV_OP_OUT);
+       return ret ^ !(info->invert & XT_PHYSDEV_OP_OUT);
 }
 
-static int
+static bool
 checkentry(const char *tablename,
                       const void *ip,
                       const struct xt_match *match,
@@ -112,7 +109,7 @@ checkentry(const char *tablename,
 
        if (!(info->bitmask & XT_PHYSDEV_OP_MASK) ||
            info->bitmask & ~XT_PHYSDEV_OP_MASK)
-               return 0;
+               return false;
        if (info->bitmask & XT_PHYSDEV_OP_OUT &&
            (!(info->bitmask & XT_PHYSDEV_OP_BRIDGED) ||
             info->invert & XT_PHYSDEV_OP_BRIDGED) &&
@@ -122,12 +119,12 @@ checkentry(const char *tablename,
                       "OUTPUT, FORWARD and POSTROUTING chains for non-bridged "
                       "traffic is not supported anymore.\n");
                if (hook_mask & (1 << NF_IP_LOCAL_OUT))
-                       return 0;
+                       return false;
        }
-       return 1;
+       return true;
 }
 
-static struct xt_match xt_physdev_match[] = {
+static struct xt_match xt_physdev_match[] __read_mostly = {
        {
                .name           = "physdev",
                .family         = AF_INET,