[NETFILTER]: Convert x_tables matches/targets to centralized error checking

[deliverable/linux.git] / net / netfilter / xt_conntrack.c

diff --git a/net/netfilter/xt_conntrack.c b/net/netfilter/xt_conntrack.c
index ffdebc95eb9520902944e9a9875d58589b1a90f4..45a5a7d1939aef93fca22720c3f58c23ad571181 100644 (file)
--- a/net/netfilter/xt_conntrack.c
+++ b/net/netfilter/xt_conntrack.c
@@ -201,22 +201,10 @@ match(const struct sk_buff *skb,
 
 #endif /* CONFIG_NF_IP_CONNTRACK */
 
-static int check(const char *tablename,
-                const void *ip,
-                void *matchinfo,
-                unsigned int matchsize,
-                unsigned int hook_mask)
-{
-       if (matchsize != XT_ALIGN(sizeof(struct xt_conntrack_info)))
-               return 0;
-
-       return 1;
-}
-
 static struct xt_match conntrack_match = {
        .name           = "conntrack",
-       .match          = &match,
-       .checkentry     = &check,
+       .match          = match,
+       .matchsize      = sizeof(struct xt_conntrack_info),
        .me             = THIS_MODULE,
 };