p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

netfilter: cleanup unused macro 

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

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

Signed-off-by: Li RongQing <lirongqing@baidu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Li RongQing 2020-02-20 15:20:18 +08:00 committed by Pablo Neira Ayuso
parent 24d19826fc
commit 9325f070f7
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/netfilter/nf_conntrack_core.c
View File

@ -2633,7 +2633,6 @@ void nf_conntrack_init_end(void)
*/ */
#define UNCONFIRMED_NULLS_VAL ((1<<30)+0) #define UNCONFIRMED_NULLS_VAL ((1<<30)+0)
#define DYING_NULLS_VAL ((1<<30)+1) #define DYING_NULLS_VAL ((1<<30)+1)
#define TEMPLATE_NULLS_VAL ((1<<30)+2)
int nf_conntrack_init_net(struct net *net) int nf_conntrack_init_net(struct net *net)
{ {

2
net/netfilter/xt_SECMARK.c
View File

@ -21,8 +21,6 @@ MODULE_DESCRIPTION("Xtables: packet security mark modification");
MODULE_ALIAS("ipt_SECMARK"); MODULE_ALIAS("ipt_SECMARK");
MODULE_ALIAS("ip6t_SECMARK"); MODULE_ALIAS("ip6t_SECMARK");
#define PFX "SECMARK: "
static u8 mode; static u8 mode;
static unsigned int static unsigned int