[NETFILTER]: x_tables: consistent and unique symbol names

Give all Netfilter modules consistent and unique symbol names.

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 29 insertions, 40 deletions

diff --git a/net/netfilter/xt_MARK.c b/net/netfilter/xt_MARK.c
index bc6503d77d7..de32aa5b57f 100644
--- a/net/netfilter/xt_MARK.c
+++ b/net/netfilter/xt_MARK.c
@@ -22,12 +22,9 @@ MODULE_ALIAS("ipt_MARK");
 MODULE_ALIAS("ip6t_MARK");
 
 static unsigned int
-target_v0(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)
+mark_tg_v0(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)
 {
         const struct xt_mark_target_info *markinfo = targinfo;
 
@@ -36,12 +33,9 @@ target_v0(struct sk_buff *skb,
 }
 
 static unsigned int
-target_v1(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)
+mark_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)
 {
         const struct xt_mark_target_info_v1 *markinfo = targinfo;
         int mark = 0;
@@ -64,13 +58,10 @@ target_v1(struct sk_buff *skb,
         return XT_CONTINUE;
 }
 
-
 static bool
-checkentry_v0(const char *tablename,
-              const void *entry,
-              const struct xt_target *target,
-              void *targinfo,
-              unsigned int hook_mask)
+mark_tg_check_v0(const char *tablename, const void *entry,
+                 const struct xt_target *target, void *targinfo,
+                 unsigned int hook_mask)
 {
         const struct xt_mark_target_info *markinfo = targinfo;
 
@@ -82,11 +73,9 @@ checkentry_v0(const char *tablename,
 }
 
 static bool
-checkentry_v1(const char *tablename,
-              const void *entry,
-              const struct xt_target *target,
-              void *targinfo,
-              unsigned int hook_mask)
+mark_tg_check(const char *tablename, const void *entry,
+              const struct xt_target *target, void *targinfo,
+              unsigned int hook_mask)
 {
         const struct xt_mark_target_info_v1 *markinfo = targinfo;
 
@@ -112,7 +101,7 @@ struct compat_xt_mark_target_info_v1 {
         u_int16_t       __pad2;
 };
 
-static void compat_from_user_v1(void *dst, void *src)
+static void mark_tg_compat_from_user(void *dst, void *src)
 {
         const struct compat_xt_mark_target_info_v1 *cm = src;
         struct xt_mark_target_info_v1 m = {
@@ -122,7 +111,7 @@ static void compat_from_user_v1(void *dst, void *src)
         memcpy(dst, &m, sizeof(m));
 }
 
-static int compat_to_user_v1(void __user *dst, void *src)
+static int mark_tg_compat_to_user(void __user *dst, void *src)
 {
         const struct xt_mark_target_info_v1 *m = src;
         struct compat_xt_mark_target_info_v1 cm = {
@@ -133,13 +122,13 @@ static int compat_to_user_v1(void __user *dst, void *src)
 }
 #endif /* CONFIG_COMPAT */
 
-static struct xt_target xt_mark_target[] __read_mostly = {
+static struct xt_target mark_tg_reg[] __read_mostly = {
         {
                 .name           = "MARK",
                 .family         = AF_INET,
                 .revision       = 0,
-                .checkentry     = checkentry_v0,
-                .target         = target_v0,
+                .checkentry     = mark_tg_check_v0,
+                .target         = mark_tg_v0,
                 .targetsize     = sizeof(struct xt_mark_target_info),
                 .table          = "mangle",
                 .me             = THIS_MODULE,
@@ -148,13 +137,13 @@ static struct xt_target xt_mark_target[] __read_mostly = {
                 .name           = "MARK",
                 .family         = AF_INET,
                 .revision       = 1,
-                .checkentry     = checkentry_v1,
-                .target         = target_v1,
+                .checkentry     = mark_tg_check,
+                .target         = mark_tg,
                 .targetsize     = sizeof(struct xt_mark_target_info_v1),
 #ifdef CONFIG_COMPAT
                 .compatsize     = sizeof(struct compat_xt_mark_target_info_v1),
-                .compat_from_user = compat_from_user_v1,
-                .compat_to_user = compat_to_user_v1,
+                .compat_from_user = mark_tg_compat_from_user,
+                .compat_to_user = mark_tg_compat_to_user,
 #endif
                 .table          = "mangle",
                 .me             = THIS_MODULE,
@@ -163,23 +152,23 @@ static struct xt_target xt_mark_target[] __read_mostly = {
                 .name           = "MARK",
                 .family         = AF_INET6,
                 .revision       = 0,
-                .checkentry     = checkentry_v0,
-                .target         = target_v0,
+                .checkentry     = mark_tg_check_v0,
+                .target         = mark_tg_v0,
                 .targetsize     = sizeof(struct xt_mark_target_info),
                 .table          = "mangle",
                 .me             = THIS_MODULE,
         },
 };
 
-static int __init xt_mark_init(void)
+static int __init mark_tg_init(void)
 {
-        return xt_register_targets(xt_mark_target, ARRAY_SIZE(xt_mark_target));
+        return xt_register_targets(mark_tg_reg, ARRAY_SIZE(mark_tg_reg));
 }
 
-static void __exit xt_mark_fini(void)
+static void __exit mark_tg_exit(void)
 {
-        xt_unregister_targets(xt_mark_target, ARRAY_SIZE(xt_mark_target));
+        xt_unregister_targets(mark_tg_reg, ARRAY_SIZE(mark_tg_reg));
 }
 
-module_init(xt_mark_init);
-module_exit(xt_mark_fini);
+module_init(mark_tg_init);
+module_exit(mark_tg_exit);