Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[karo-tx-linux.git] / net / netfilter / xt_mark.c

diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
index b21b94a4684f1f7d77f824c083c3576e36591ea7..ce0badfeef9a77e910fe2bdf78c4c41207647ec0 100644 (file)
--- a/net/netfilter/xt_mark.c
+++ b/net/netfilter/xt_mark.c
@@ -23,6 +23,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,
@@ -36,6 +37,7 @@ match(const struct sk_buff *skb,
 static int
 checkentry(const char *tablename,
            const void *entry,
+          const struct xt_match *match,
            void *matchinfo,
            unsigned int matchsize,
            unsigned int hook_mask)
@@ -54,6 +56,7 @@ static struct xt_match mark_match = {
        .match          = match,
        .matchsize      = sizeof(struct xt_mark_info),
        .checkentry     = checkentry,
+       .family         = AF_INET,
        .me             = THIS_MODULE,
 };
 
@@ -62,27 +65,28 @@ static struct xt_match mark6_match = {
        .match          = match,
        .matchsize      = sizeof(struct xt_mark_info),
        .checkentry     = checkentry,
+       .family         = AF_INET6,
        .me             = THIS_MODULE,
 };
 
 static int __init init(void)
 {
        int ret;
-       ret = xt_register_match(AF_INET, &mark_match);
+       ret = xt_register_match(&mark_match);
        if (ret)
                return ret;
 
-       ret = xt_register_match(AF_INET6, &mark6_match);
+       ret = xt_register_match(&mark6_match);
        if (ret)
-               xt_unregister_match(AF_INET, &mark_match);
+               xt_unregister_match(&mark_match);
 
        return ret;
 }
 
 static void __exit fini(void)
 {
-       xt_unregister_match(AF_INET, &mark_match);
-       xt_unregister_match(AF_INET6, &mark6_match);
+       xt_unregister_match(&mark_match);
+       xt_unregister_match(&mark6_match);
 }
 
 module_init(init);