From 712a87eb420849fe2def162d513fb8f3c0f237a3 Mon Sep 17 00:00:00 2001 From: Li RongQing Date: Thu, 20 Feb 2020 15:20:18 +0800 Subject: [PATCH] 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_") Signed-off-by: Li RongQing Signed-off-by: Pablo Neira Ayuso --- net/netfilter/nf_conntrack_core.c | 1 - net/netfilter/xt_SECMARK.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 1927fc296f951..a18f8fe728e31 100644 --- 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 2317721f3ecb1..75625d13e976c 100644 --- 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 -- 2.39.5