2021-03-27 03:03:23

by Jiabing Wan

Subject: [PATCH] netfilter: ipset: Remove duplicate declaration

struct ip_set is declared twice. One is declared at 79th line,
so remove the duplicate.

Signed-off-by: Wan Jiabing <[email protected]>
---
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

2021-03-28 19:44:25

by Jozsef Kadlecsik

Subject: Re: [PATCH] netfilter: ipset: Remove duplicate declaration

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 <[email protected]>

Acked-by: Jozsef Kadlecsik <[email protected]>

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 : [email protected], [email protected]
PGP key : https://wigner.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics
H-1525 Budapest 114, POB. 49, Hungary

2021-03-30 23:01:14

by Pablo Neira Ayuso

Subject: Re: [PATCH] netfilter: ipset: Remove duplicate declaration

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.