Hi, On 2021/6/2 18:40, Pablo Neira Ayuso wrote: > Hi, > > On Sat, May 29, 2021 at 02:49:26PM +0800, Shaokun Zhang wrote: >> Variable 'nf_conntrack_net_id' is declared twice, so remove the >> repeated declaration. > > Thanks for your patch. > > I prefer to fix this in nf-next with this patch I'm proposing: > Look fine to me. Thanks your reply, Shaokun > https://patchwork.ozlabs.org/project/netfilter-devel/patch/20210602103907.8082-1-pablo@xxxxxxxxxxxxx/ > >> Cc: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> >> Cc: Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> >> Cc: Florian Westphal <fw@xxxxxxxxx> >> Signed-off-by: Shaokun Zhang <zhangshaokun@xxxxxxxxxxxxx> >> --- >> net/netfilter/nf_conntrack_core.c | 2 -- >> 1 file changed, 2 deletions(-) >> >> diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c >> index e0befcf8113a..757520725cd4 100644 >> --- a/net/netfilter/nf_conntrack_core.c >> +++ b/net/netfilter/nf_conntrack_core.c >> @@ -87,8 +87,6 @@ static __read_mostly bool nf_conntrack_locks_all; >> >> static struct conntrack_gc_work conntrack_gc_work; >> >> -extern unsigned int nf_conntrack_net_id; >> - >> void nf_conntrack_lock(spinlock_t *lock) __acquires(lock) >> { >> /* 1) Acquire the lock */ >> -- >> 2.7.4 >> > . >
