netfilter: cleanup unused macro

TEMPLATE_NULLS_VAL is not used after commit 9a9d44965684
("netfilter: fix netns dependencies with conntrack templates")

PFX is not used after commit 28260349a38a3 ("netfilter: xt
extensions: use pr_<level>")

Signed-off-by: Li RongQing <lirongqing@baidu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 1927fc296f9514bcd5866d340c6f659bea0fdb3e..a18f8fe728e3124869774e62aad80c14ac34ab16 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -2633,7 +2633,6 @@ void nf_conntrack_init_end(void)
  */
 #define UNCONFIRMED_NULLS_VAL  ((1<<30)+0)
 #define DYING_NULLS_VAL                ((1<<30)+1)
-#define TEMPLATE_NULLS_VAL     ((1<<30)+2)
 
 int nf_conntrack_init_net(struct net *net)
 {

diff --git a/net/netfilter/xt_SECMARK.c b/net/netfilter/xt_SECMARK.c
index 2317721f3ecb14bd6ce0ca13b9bc380773f8a330..75625d13e976c70dd8fac8d4609700a50022dd18 100644 (file)
--- a/net/netfilter/xt_SECMARK.c
+++ b/net/netfilter/xt_SECMARK.c
@@ -21,8 +21,6 @@ MODULE_DESCRIPTION("Xtables: packet security mark modification");
 MODULE_ALIAS("ipt_SECMARK");
 MODULE_ALIAS("ip6t_SECMARK");
 
-#define PFX "SECMARK: "
-
 static u8 mode;
 
 static unsigned int