NFS: Kill the obsolete NFS_PARANOIA

[powerpc.git] / net / netfilter / xt_physdev.c

diff --git a/net/netfilter/xt_physdev.c b/net/netfilter/xt_physdev.c
index 63a9654..35a0fe2 100644 (file)
--- a/net/netfilter/xt_physdev.c
+++ b/net/netfilter/xt_physdev.c
@@ -106,7 +106,6 @@ checkentry(const char *tablename,
                       const void *ip,
                       const struct xt_match *match,
                       void *matchinfo,
-                      unsigned int matchsize,
                       unsigned int hook_mask)
 {
        const struct xt_physdev_info *info = matchinfo;
@@ -114,61 +113,48 @@ checkentry(const char *tablename,
        if (!(info->bitmask & XT_PHYSDEV_OP_MASK) ||
            info->bitmask & ~XT_PHYSDEV_OP_MASK)
                return 0;
-       if (brnf_deferred_hooks == 0 &&
-           info->bitmask & XT_PHYSDEV_OP_OUT &&
+       if (info->bitmask & XT_PHYSDEV_OP_OUT &&
            (!(info->bitmask & XT_PHYSDEV_OP_BRIDGED) ||
             info->invert & XT_PHYSDEV_OP_BRIDGED) &&
            hook_mask & ((1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_FORWARD) |
-                        (1 << NF_IP_POST_ROUTING))) {
+                        (1 << NF_IP_POST_ROUTING))) {
                printk(KERN_WARNING "physdev match: using --physdev-out in the "
                       "OUTPUT, FORWARD and POSTROUTING chains for non-bridged "
-                      "traffic is deprecated and breaks other things, it will "
-                      "be removed in January 2007. See Documentation/"
-                      "feature-removal-schedule.txt for details. This doesn't "
-                      "affect you in case you're using it for purely bridged "
-                      "traffic.\n");
-               brnf_deferred_hooks = 1;
+                      "traffic is not supported anymore.\n");
+               if (hook_mask & (1 << NF_IP_LOCAL_OUT))
+                       return 0;
        }
        return 1;
 }
 
-static struct xt_match physdev_match = {
-       .name           = "physdev",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_physdev_info),
-       .checkentry     = checkentry,
-       .family         = AF_INET,
-       .me             = THIS_MODULE,
-};
-
-static struct xt_match physdev6_match = {
-       .name           = "physdev",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_physdev_info),
-       .checkentry     = checkentry,
-       .family         = AF_INET6,
-       .me             = THIS_MODULE,
+static struct xt_match xt_physdev_match[] = {
+       {
+               .name           = "physdev",
+               .family         = AF_INET,
+               .checkentry     = checkentry,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_physdev_info),
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "physdev",
+               .family         = AF_INET6,
+               .checkentry     = checkentry,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_physdev_info),
+               .me             = THIS_MODULE,
+       },
 };
 
 static int __init xt_physdev_init(void)
 {
-       int ret;
-
-       ret = xt_register_match(&physdev_match);
-       if (ret < 0)
-               return ret;
-
-       ret = xt_register_match(&physdev6_match);
-       if (ret < 0)
-               xt_unregister_match(&physdev_match);
-
-       return ret;
+       return xt_register_matches(xt_physdev_match,
+                                  ARRAY_SIZE(xt_physdev_match));
 }
 
 static void __exit xt_physdev_fini(void)
 {
-       xt_unregister_match(&physdev_match);
-       xt_unregister_match(&physdev6_match);
+       xt_unregister_matches(xt_physdev_match, ARRAY_SIZE(xt_physdev_match));
 }
 
 module_init(xt_physdev_init);