[NETFILTER]: xt_MARK: add compat support for revision 0

[linux-2.6] / net / netfilter / xt_connmark.c

diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c
index e73fa9b46cf7d1a747077c333e92d7ad0809140f..b5c0f2fe6997bc15df0ed5c0be0c30f74062e66a 100644 (file)
--- a/net/netfilter/xt_connmark.c
+++ b/net/netfilter/xt_connmark.c
@@ -25,20 +25,17 @@
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_connmark.h>
 
-MODULE_AUTHOR("Henrik Nordstrom <hno@marasytems.com>");
+MODULE_AUTHOR("Henrik Nordstrom <hno@marasystems.com>");
 MODULE_DESCRIPTION("IP tables connmark match module");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("ipt_connmark");
+MODULE_ALIAS("ip6t_connmark");
 
 static bool
-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,
-      bool *hotdrop)
+connmark_mt(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,
+            bool *hotdrop)
 {
        const struct xt_connmark_info *info = matchinfo;
        const struct nf_conn *ct;
@@ -52,11 +49,9 @@ match(const struct sk_buff *skb,
 }
 
 static bool
-checkentry(const char *tablename,
-          const void *ip,
-          const struct xt_match *match,
-          void *matchinfo,
-          unsigned int hook_mask)
+connmark_mt_check(const char *tablename, const void *ip,
+                  const struct xt_match *match, void *matchinfo,
+                  unsigned int hook_mask)
 {
        const struct xt_connmark_info *cm = matchinfo;
 
@@ -73,7 +68,7 @@ checkentry(const char *tablename,
 }
 
 static void
-destroy(const struct xt_match *match, void *matchinfo)
+connmark_mt_destroy(const struct xt_match *match, void *matchinfo)
 {
        nf_ct_l3proto_module_put(match->family);
 }
@@ -86,7 +81,7 @@ struct compat_xt_connmark_info {
        u_int16_t       __pad2;
 };
 
-static void compat_from_user(void *dst, void *src)
+static void connmark_mt_compat_from_user(void *dst, void *src)
 {
        const struct compat_xt_connmark_info *cm = src;
        struct xt_connmark_info m = {
@@ -97,7 +92,7 @@ static void compat_from_user(void *dst, void *src)
        memcpy(dst, &m, sizeof(m));
 }
 
-static int compat_to_user(void __user *dst, void *src)
+static int connmark_mt_compat_to_user(void __user *dst, void *src)
 {
        const struct xt_connmark_info *m = src;
        struct compat_xt_connmark_info cm = {
@@ -109,42 +104,47 @@ static int compat_to_user(void __user *dst, void *src)
 }
 #endif /* CONFIG_COMPAT */
 
-static struct xt_match xt_connmark_match[] __read_mostly = {
+static struct xt_match connmark_mt_reg[] __read_mostly = {
        {
                .name           = "connmark",
                .family         = AF_INET,
-               .checkentry     = checkentry,
-               .match          = match,
-               .destroy        = destroy,
+               .checkentry     = connmark_mt_check,
+               .match          = connmark_mt,
+               .destroy        = connmark_mt_destroy,
                .matchsize      = sizeof(struct xt_connmark_info),
 #ifdef CONFIG_COMPAT
                .compatsize     = sizeof(struct compat_xt_connmark_info),
-               .compat_from_user = compat_from_user,
-               .compat_to_user = compat_to_user,
+               .compat_from_user = connmark_mt_compat_from_user,
+               .compat_to_user = connmark_mt_compat_to_user,
 #endif
                .me             = THIS_MODULE
        },
        {
                .name           = "connmark",
                .family         = AF_INET6,
-               .checkentry     = checkentry,
-               .match          = match,
-               .destroy        = destroy,
+               .checkentry     = connmark_mt_check,
+               .match          = connmark_mt,
+               .destroy        = connmark_mt_destroy,
                .matchsize      = sizeof(struct xt_connmark_info),
+#ifdef CONFIG_COMPAT
+               .compatsize     = sizeof(struct compat_xt_connmark_info),
+               .compat_from_user = connmark_mt_compat_from_user,
+               .compat_to_user = connmark_mt_compat_to_user,
+#endif
                .me             = THIS_MODULE
        },
 };
 
-static int __init xt_connmark_init(void)
+static int __init connmark_mt_init(void)
 {
-       return xt_register_matches(xt_connmark_match,
-                                  ARRAY_SIZE(xt_connmark_match));
+       return xt_register_matches(connmark_mt_reg,
+              ARRAY_SIZE(connmark_mt_reg));
 }
 
-static void __exit xt_connmark_fini(void)
+static void __exit connmark_mt_exit(void)
 {
-       xt_unregister_matches(xt_connmark_match, ARRAY_SIZE(xt_connmark_match));
+       xt_unregister_matches(connmark_mt_reg, ARRAY_SIZE(connmark_mt_reg));
 }
 
-module_init(xt_connmark_init);
-module_exit(xt_connmark_fini);
+module_init(connmark_mt_init);
+module_exit(connmark_mt_exit);