Merge nommu tree

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

diff --git a/net/netfilter/xt_physdev.c b/net/netfilter/xt_physdev.c
index 19bb57c..089f4f7 100644 (file)
--- a/net/netfilter/xt_physdev.c
+++ b/net/netfilter/xt_physdev.c
@@ -26,6 +26,7 @@ static int
 match(const struct sk_buff *skb,
       const struct net_device *in,
       const struct net_device *out,
+      const struct xt_match *match,
       const void *matchinfo,
       int offset,
       unsigned int protoff,
@@ -102,14 +103,13 @@ match_outdev:
 static int
 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;
 
-       if (matchsize != XT_ALIGN(sizeof(struct xt_physdev_info)))
-               return 0;
        if (!(info->bitmask & XT_PHYSDEV_OP_MASK) ||
            info->bitmask & ~XT_PHYSDEV_OP_MASK)
                return 0;
@@ -118,15 +118,19 @@ checkentry(const char *tablename,
 
 static struct xt_match physdev_match = {
        .name           = "physdev",
-       .match          = &match,
-       .checkentry     = &checkentry,
+       .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,
-       .checkentry     = &checkentry,
+       .match          = match,
+       .matchsize      = sizeof(struct xt_physdev_info),
+       .checkentry     = checkentry,
+       .family         = AF_INET6,
        .me             = THIS_MODULE,
 };
 
@@ -134,21 +138,21 @@ static int __init init(void)
 {
        int ret;
 
-       ret = xt_register_match(AF_INET, &physdev_match);
+       ret = xt_register_match(&physdev_match);
        if (ret < 0)
                return ret;
 
-       ret = xt_register_match(AF_INET6, &physdev6_match);
+       ret = xt_register_match(&physdev6_match);
        if (ret < 0)
-               xt_unregister_match(AF_INET, &physdev_match);
+               xt_unregister_match(&physdev_match);
 
        return ret;
 }
 
 static void __exit fini(void)
 {
-       xt_unregister_match(AF_INET, &physdev_match);
-       xt_unregister_match(AF_INET6, &physdev6_match);
+       xt_unregister_match(&physdev_match);
+       xt_unregister_match(&physdev6_match);
 }
 
 module_init(init);