* [PATCH] netfilter: ipset: Remove duplicate declaration
@ 2021-03-27 2:54 Wan Jiabing
2021-03-28 19:30 ` Jozsef Kadlecsik
0 siblings, 1 reply; 3+ messages in thread
From: Wan Jiabing @ 2021-03-27 2:54 UTC (permalink / raw)
To: Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal,
Wan Jiabing, netfilter-devel, coreteam, linux-kernel
Cc: kael_w
struct ip_set is declared twice. One is declared at 79th line,
so remove the duplicate.
Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
---
include/linux/netfilter/ipset/ip_set.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
index 46d9a0c26c67..10279c4830ac 100644
--- a/include/linux/netfilter/ipset/ip_set.h
+++ b/include/linux/netfilter/ipset/ip_set.h
@@ -124,8 +124,6 @@ struct ip_set_ext {
bool target;
};
-struct ip_set;
-
#define ext_timeout(e, s) \
((unsigned long *)(((void *)(e)) + (s)->offset[IPSET_EXT_ID_TIMEOUT]))
#define ext_counter(e, s) \
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] netfilter: ipset: Remove duplicate declaration
2021-03-27 2:54 [PATCH] netfilter: ipset: Remove duplicate declaration Wan Jiabing
@ 2021-03-28 19:30 ` Jozsef Kadlecsik
2021-03-30 22:56 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Jozsef Kadlecsik @ 2021-03-28 19:30 UTC (permalink / raw)
To: Wan Jiabing
Cc: Pablo Neira Ayuso, Florian Westphal, netfilter-devel, coreteam,
linux-kernel, kael_w
On Sat, 27 Mar 2021, Wan Jiabing wrote:
> struct ip_set is declared twice. One is declared at 79th line,
> so remove the duplicate.
Yes, it's a duplicate. Pablo, could you apply it?
> Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
Acked-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Best regards,
Jozsef
> ---
> include/linux/netfilter/ipset/ip_set.h | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
> index 46d9a0c26c67..10279c4830ac 100644
> --- a/include/linux/netfilter/ipset/ip_set.h
> +++ b/include/linux/netfilter/ipset/ip_set.h
> @@ -124,8 +124,6 @@ struct ip_set_ext {
> bool target;
> };
>
> -struct ip_set;
> -
> #define ext_timeout(e, s) \
> ((unsigned long *)(((void *)(e)) + (s)->offset[IPSET_EXT_ID_TIMEOUT]))
> #define ext_counter(e, s) \
> --
> 2.25.1
>
>
-
E-mail : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.hu
PGP key : https://wigner.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics
H-1525 Budapest 114, POB. 49, Hungary
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] netfilter: ipset: Remove duplicate declaration
2021-03-28 19:30 ` Jozsef Kadlecsik
@ 2021-03-30 22:56 ` Pablo Neira Ayuso
0 siblings, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2021-03-30 22:56 UTC (permalink / raw)
To: Jozsef Kadlecsik
Cc: Wan Jiabing, Florian Westphal, netfilter-devel, coreteam,
linux-kernel, kael_w
On Sun, Mar 28, 2021 at 09:30:49PM +0200, Jozsef Kadlecsik wrote:
> On Sat, 27 Mar 2021, Wan Jiabing wrote:
>
> > struct ip_set is declared twice. One is declared at 79th line,
> > so remove the duplicate.
>
> Yes, it's a duplicate. Pablo, could you apply it?
Applied, thanks Jozsef.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-30 22:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-27 2:54 [PATCH] netfilter: ipset: Remove duplicate declaration Wan Jiabing
2021-03-28 19:30 ` Jozsef Kadlecsik
2021-03-30 22:56 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).