Merge branch 'e1000-fixes' of git://198.78.49.142/~jbrandeb/linux-2.6

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

diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c
index d06e925032dab42562b03e7deee4d6cc6a8f3ad8..51822471e919136220e5e8b8349eaeb9ef33ee3f 100644 (file)
--- a/net/netfilter/xt_connmark.c
+++ b/net/netfilter/xt_connmark.c
@@ -35,6 +35,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,
@@ -52,37 +53,36 @@ match(const struct sk_buff *skb,
 static int
 checkentry(const char *tablename,
           const void *ip,
+          const struct xt_match *match,
           void *matchinfo,
           unsigned int matchsize,
           unsigned int hook_mask)
 {
-       struct xt_connmark_info *cm = 
-                               (struct xt_connmark_info *)matchinfo;
-       if (matchsize != XT_ALIGN(sizeof(struct xt_connmark_info)))
-               return 0;
+       struct xt_connmark_info *cm = (struct xt_connmark_info *)matchinfo;
 
        if (cm->mark > 0xffffffff || cm->mask > 0xffffffff) {
                printk(KERN_WARNING "connmark: only support 32bit mark\n");
                return 0;
        }
-
        return 1;
 }
 
 static struct xt_match connmark_match = {
-       .name = "connmark",
-       .match = &match,
-       .checkentry = &checkentry,
-       .me = THIS_MODULE
+       .name           = "connmark",
+       .match          = match,
+       .matchsize      = sizeof(struct xt_connmark_info),
+       .checkentry     = checkentry,
+       .me             = THIS_MODULE
 };
+
 static struct xt_match connmark6_match = {
-       .name = "connmark",
-       .match = &match,
-       .checkentry = &checkentry,
-       .me = THIS_MODULE
+       .name           = "connmark",
+       .match          = match,
+       .matchsize      = sizeof(struct xt_connmark_info),
+       .checkentry     = checkentry,
+       .me             = THIS_MODULE
 };
 
-
 static int __init init(void)
 {
        int ret;