[MIPS] Remove pnx8550-v2pci_defconfig

[~andy/linux] / net / netfilter / xt_connmark.c

diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c
index c9104d05a19cf53190a9d1528073b07eb505408c..36c2defff238b193d7377b7e81dfa18d4705b007 100644 (file)
--- a/net/netfilter/xt_connmark.c
+++ b/net/netfilter/xt_connmark.c
@@ -63,24 +63,51 @@ checkentry(const char *tablename,
                printk(KERN_WARNING "connmark: only support 32bit mark\n");
                return 0;
        }
-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
-               printk(KERN_WARNING "can't load nf_conntrack support for "
+               printk(KERN_WARNING "can't load conntrack support for "
                                    "proto=%d\n", match->family);
                return 0;
        }
-#endif
        return 1;
 }
 
 static void
 destroy(const struct xt_match *match, void *matchinfo)
 {
-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        nf_ct_l3proto_module_put(match->family);
-#endif
 }
 
+#ifdef CONFIG_COMPAT
+struct compat_xt_connmark_info {
+       compat_ulong_t  mark, mask;
+       u_int8_t        invert;
+       u_int8_t        __pad1;
+       u_int16_t       __pad2;
+};
+
+static void compat_from_user(void *dst, void *src)
+{
+       struct compat_xt_connmark_info *cm = src;
+       struct xt_connmark_info m = {
+               .mark   = cm->mark,
+               .mask   = cm->mask,
+               .invert = cm->invert,
+       };
+       memcpy(dst, &m, sizeof(m));
+}
+
+static int compat_to_user(void __user *dst, void *src)
+{
+       struct xt_connmark_info *m = src;
+       struct compat_xt_connmark_info cm = {
+               .mark   = m->mark,
+               .mask   = m->mask,
+               .invert = m->invert,
+       };
+       return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
+}
+#endif /* CONFIG_COMPAT */
+
 static struct xt_match xt_connmark_match[] = {
        {
                .name           = "connmark",
@@ -89,6 +116,11 @@ static struct xt_match xt_connmark_match[] = {
                .match          = match,
                .destroy        = 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,
+#endif
                .me             = THIS_MODULE
        },
        {
@@ -104,14 +136,13 @@ static struct xt_match xt_connmark_match[] = {
 
 static int __init xt_connmark_init(void)
 {
-       need_conntrack();
        return xt_register_matches(xt_connmark_match,
                                   ARRAY_SIZE(xt_connmark_match));
 }
 
 static void __exit xt_connmark_fini(void)
 {
-       xt_register_matches(xt_connmark_match, ARRAY_SIZE(xt_connmark_match));
+       xt_unregister_matches(xt_connmark_match, ARRAY_SIZE(xt_connmark_match));
 }
 
 module_init(xt_connmark_init);