[NETFILTER]: x_tables: enable compat translation for IPv6 matches/targets

[mirror_ubuntu-bionic-kernel.git] / net / netfilter / xt_CONNSECMARK.c

diff --git a/net/netfilter/xt_CONNSECMARK.c b/net/netfilter/xt_CONNSECMARK.c
index 63d73138c1b9e6482908a39ad3f1e1e7ceeb5295..2c265e87f39655ba2e87a7799cc9006a6d5c4189 100644 (file)
--- a/net/netfilter/xt_CONNSECMARK.c
+++ b/net/netfilter/xt_CONNSECMARK.c
@@ -61,12 +61,11 @@ static void secmark_restore(struct sk_buff *skb)
        }
 }
 
-static unsigned int target(struct sk_buff **pskb, const struct net_device *in,
-                          const struct net_device *out, unsigned int hooknum,
-                          const struct xt_target *target,
-                          const void *targinfo)
+static unsigned int
+connsecmark_tg(struct sk_buff *skb, const struct net_device *in,
+               const struct net_device *out, unsigned int hooknum,
+               const struct xt_target *target, const void *targinfo)
 {
-       struct sk_buff *skb = *pskb;
        const struct xt_connsecmark_target_info *info = targinfo;
 
        switch (info->mode) {
@@ -85,17 +84,13 @@ static unsigned int target(struct sk_buff **pskb, const struct net_device *in,
        return XT_CONTINUE;
 }
 
-static bool checkentry(const char *tablename, const void *entry,
-                      const struct xt_target *target, void *targinfo,
-                      unsigned int hook_mask)
+static bool
+connsecmark_tg_check(const char *tablename, const void *entry,
+                     const struct xt_target *target, void *targinfo,
+                     unsigned int hook_mask)
 {
        const struct xt_connsecmark_target_info *info = targinfo;
 
-       if (nf_ct_l3proto_try_module_get(target->family) < 0) {
-               printk(KERN_WARNING "can't load conntrack support for "
-                                   "proto=%d\n", target->family);
-               return false;
-       }
        switch (info->mode) {
        case CONNSECMARK_SAVE:
        case CONNSECMARK_RESTORE:
@@ -106,22 +101,27 @@ static bool checkentry(const char *tablename, const void *entry,
                return false;
        }
 
+       if (nf_ct_l3proto_try_module_get(target->family) < 0) {
+               printk(KERN_WARNING "can't load conntrack support for "
+                                   "proto=%d\n", target->family);
+               return false;
+       }
        return true;
 }
 
 static void
-destroy(const struct xt_target *target, void *targinfo)
+connsecmark_tg_destroy(const struct xt_target *target, void *targinfo)
 {
        nf_ct_l3proto_module_put(target->family);
 }
 
-static struct xt_target xt_connsecmark_target[] __read_mostly = {
+static struct xt_target connsecmark_tg_reg[] __read_mostly = {
        {
                .name           = "CONNSECMARK",
                .family         = AF_INET,
-               .checkentry     = checkentry,
-               .destroy        = destroy,
-               .target         = target,
+               .checkentry     = connsecmark_tg_check,
+               .destroy        = connsecmark_tg_destroy,
+               .target         = connsecmark_tg,
                .targetsize     = sizeof(struct xt_connsecmark_target_info),
                .table          = "mangle",
                .me             = THIS_MODULE,
@@ -129,26 +129,26 @@ static struct xt_target xt_connsecmark_target[] __read_mostly = {
        {
                .name           = "CONNSECMARK",
                .family         = AF_INET6,
-               .checkentry     = checkentry,
-               .destroy        = destroy,
-               .target         = target,
+               .checkentry     = connsecmark_tg_check,
+               .destroy        = connsecmark_tg_destroy,
+               .target         = connsecmark_tg,
                .targetsize     = sizeof(struct xt_connsecmark_target_info),
                .table          = "mangle",
                .me             = THIS_MODULE,
        },
 };
 
-static int __init xt_connsecmark_init(void)
+static int __init connsecmark_tg_init(void)
 {
-       return xt_register_targets(xt_connsecmark_target,
-                                  ARRAY_SIZE(xt_connsecmark_target));
+       return xt_register_targets(connsecmark_tg_reg,
+              ARRAY_SIZE(connsecmark_tg_reg));
 }
 
-static void __exit xt_connsecmark_fini(void)
+static void __exit connsecmark_tg_exit(void)
 {
-       xt_unregister_targets(xt_connsecmark_target,
-                             ARRAY_SIZE(xt_connsecmark_target));
+       xt_unregister_targets(connsecmark_tg_reg,
+                             ARRAY_SIZE(connsecmark_tg_reg));
 }
 
-module_init(xt_connsecmark_init);
-module_exit(xt_connsecmark_fini);
+module_init(connsecmark_tg_init);
+module_exit(connsecmark_tg_exit);