From: Jan Engelhardt <jengelh@medozas.de>
Date: Sun, 26 Apr 2009 20:07:43 +0000 (+0200)
Subject: iface: dissolve module name/revision macros
X-Git-Tag: v1.15~4^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d8ce3acae27f58e0473ee8467536e85150716c5;p=thirdparty%2Fxtables-addons.git

iface: dissolve module name/revision macros

The module name will unlikely be changing anytime soon. And if the
revision increases, we cannot just bump the number (well, in
Xtables-addons we can, but it would not be the case for the core
kernel). So let's not get into bad habits.
---

diff --git a/extensions/libxt_iface.c b/extensions/libxt_iface.c
index 8b162df..d5631de 100644
--- a/extensions/libxt_iface.c
+++ b/extensions/libxt_iface.c
@@ -68,7 +68,7 @@ static bool iface_valid_name(const char *name)
 static void iface_mt_help(void)
 {
 	printf(
-	_MODULE_NAME " match options:\n"
+	"iface match options:\n"
 	"    --iface interface\t\tName of interface\n"
 	"[!] --up\n"
 	"[!] --down\t\t\tmatch if UP flag (not) set\n"
@@ -203,8 +203,8 @@ static void iface_mt_save(const void *ip, const struct xt_entry_match *match)
 
 static struct xtables_match iface_mt_reg = {
 	.version	= XTABLES_VERSION,
-	.name		= _MODULE_NAME,
-	.revision	= _MODULE_REVISION,
+	.name		= "iface",
+	.revision	= 0,
 	.family		= AF_INET,
 	.size		= XT_ALIGN(sizeof(struct xt_iface_mtinfo)),
 	.userspacesize	= XT_ALIGN(sizeof(struct xt_iface_mtinfo)),
@@ -218,8 +218,8 @@ static struct xtables_match iface_mt_reg = {
 
 static struct xtables_match iface_mt6_reg = {
 	.version	= XTABLES_VERSION,
-	.name		= _MODULE_NAME,
-	.revision	= _MODULE_REVISION,
+	.name		= "iface",
+	.revision	= 0,
 	.family		= AF_INET6,
 	.size		= XT_ALIGN(sizeof(struct xt_iface_mtinfo)),
 	.userspacesize	= XT_ALIGN(sizeof(struct xt_iface_mtinfo)),
diff --git a/extensions/xt_iface.c b/extensions/xt_iface.c
index 2d633cd..bfcbfc5 100644
--- a/extensions/xt_iface.c
+++ b/extensions/xt_iface.c
@@ -58,8 +58,8 @@ static bool xt_iface_mt(const struct sk_buff *skb,
 
 static struct xt_match xt_iface_mt_reg[] __read_mostly = {
 	{
-		.name       = _MODULE_NAME,
-		.revision   = _MODULE_REVISION,
+		.name       = "iface",
+		.revision   = 0,
 		.family     = NFPROTO_IPV4,
 		.matchsize  = XT_ALIGN(sizeof(struct xt_iface_mtinfo)),
 		.match      = xt_iface_mt,
@@ -67,8 +67,8 @@ static struct xt_match xt_iface_mt_reg[] __read_mostly = {
 		.me         = THIS_MODULE,
 	},
 	{
-		.name       = _MODULE_NAME,
-		.revision   = _MODULE_REVISION,
+		.name       = "iface",
+		.revision   = 0,
 		.family     = NFPROTO_IPV6,
 		.matchsize  = XT_ALIGN(sizeof(struct xt_iface_mtinfo)),
 		.match      = xt_iface_mt,
diff --git a/extensions/xt_iface.h b/extensions/xt_iface.h
index 97ac4eb..0a460d9 100644
--- a/extensions/xt_iface.h
+++ b/extensions/xt_iface.h
@@ -1,9 +1,6 @@
 #ifndef _LINUX_NETFILTER_XT_IFACE_H
 #define _LINUX_NETFILTER_XT_IFACE_H 1
 
-#define _MODULE_NAME "iface"
-#define _MODULE_REVISION 0
-
 #define XT_IFACE_FLAGCOUNT 11
 
 enum {