* [PATCH] netfilter: ipset: fix typo in hash size macro
@ 2025-06-19 15:10 RubenKelevra
2025-06-20 6:44 ` Jozsef Kadlecsik
2025-06-20 9:20 ` RubenKelevra
0 siblings, 2 replies; 4+ messages in thread
From: RubenKelevra @ 2025-06-19 15:10 UTC (permalink / raw)
To: Jozsef Kadlecsik
Cc: Pablo Neira Ayuso, netfilter-devel, coreteam, netdev,
linux-kernel, RubenKelevra
Rename IPSET_MIMINAL_HASHSIZE → IPSET_MINIMAL_HASHSIZE in
ip_set_hash_gen.h, matching the header typo-fix. Keep a backward-
compat alias in the header for out-of-tree users.
Signed-off-by: RubenKelevra <rubenkelevra@gmail.com>
---
include/linux/netfilter/ipset/ip_set_hash.h | 4 +++-
net/netfilter/ipset/ip_set_hash_gen.h | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/linux/netfilter/ipset/ip_set_hash.h b/include/linux/netfilter/ipset/ip_set_hash.h
index 838abab672af1..4f7ce4eff5815 100644
--- a/include/linux/netfilter/ipset/ip_set_hash.h
+++ b/include/linux/netfilter/ipset/ip_set_hash.h
@@ -6,7 +6,9 @@
#define IPSET_DEFAULT_HASHSIZE 1024
-#define IPSET_MIMINAL_HASHSIZE 64
+#define IPSET_MINIMAL_HASHSIZE 64
+/* Legacy alias for the old typo – keep until v6.1 LTS (EOL: 2027-12-31) */
+#define IPSET_MIMINAL_HASHSIZE IPSET_MINIMAL_HASHSIZE
#define IPSET_DEFAULT_MAXELEM 65536
#define IPSET_DEFAULT_PROBES 4
#define IPSET_DEFAULT_RESIZE 100
diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
index 5251524b96afa..785d109645fed 100644
--- a/net/netfilter/ipset/ip_set_hash_gen.h
+++ b/net/netfilter/ipset/ip_set_hash_gen.h
@@ -1543,8 +1543,8 @@ IPSET_TOKEN(HTYPE, _create)(struct net *net, struct ip_set *set,
if (tb[IPSET_ATTR_HASHSIZE]) {
hashsize = ip_set_get_h32(tb[IPSET_ATTR_HASHSIZE]);
- if (hashsize < IPSET_MIMINAL_HASHSIZE)
- hashsize = IPSET_MIMINAL_HASHSIZE;
+ if (hashsize < IPSET_MINIMAL_HASHSIZE)
+ hashsize = IPSET_MINIMAL_HASHSIZE;
}
if (tb[IPSET_ATTR_MAXELEM])
--
2.49.0
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] netfilter: ipset: fix typo in hash size macro
2025-06-19 15:10 [PATCH] netfilter: ipset: fix typo in hash size macro RubenKelevra
@ 2025-06-20 6:44 ` Jozsef Kadlecsik
2025-06-20 9:20 ` RubenKelevra
1 sibling, 0 replies; 4+ messages in thread
From: Jozsef Kadlecsik @ 2025-06-20 6:44 UTC (permalink / raw)
To: RubenKelevra
Cc: Jozsef Kadlecsik, Pablo Neira Ayuso, netfilter-devel, coreteam,
netdev, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1993 bytes --]
Hi,
On Thu, 19 Jun 2025, RubenKelevra wrote:
> Rename IPSET_MIMINAL_HASHSIZE → IPSET_MINIMAL_HASHSIZE in
> ip_set_hash_gen.h, matching the header typo-fix. Keep a backward-
> compat alias in the header for out-of-tree users.
I don't think there's any need to keep a backward-comptibility alias: the
macro is absolutely internal and don't even used outside of this file.
Could you resend your patch without it?
Best regards,
Jozsef
> Signed-off-by: RubenKelevra <rubenkelevra@gmail.com>
> ---
> include/linux/netfilter/ipset/ip_set_hash.h | 4 +++-
> net/netfilter/ipset/ip_set_hash_gen.h | 4 ++--
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/netfilter/ipset/ip_set_hash.h b/include/linux/netfilter/ipset/ip_set_hash.h
> index 838abab672af1..4f7ce4eff5815 100644
> --- a/include/linux/netfilter/ipset/ip_set_hash.h
> +++ b/include/linux/netfilter/ipset/ip_set_hash.h
> @@ -6,7 +6,9 @@
>
>
> #define IPSET_DEFAULT_HASHSIZE 1024
> -#define IPSET_MIMINAL_HASHSIZE 64
> +#define IPSET_MINIMAL_HASHSIZE 64
> +/* Legacy alias for the old typo – keep until v6.1 LTS (EOL: 2027-12-31) */
> +#define IPSET_MIMINAL_HASHSIZE IPSET_MINIMAL_HASHSIZE
> #define IPSET_DEFAULT_MAXELEM 65536
> #define IPSET_DEFAULT_PROBES 4
> #define IPSET_DEFAULT_RESIZE 100
> diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
> index 5251524b96afa..785d109645fed 100644
> --- a/net/netfilter/ipset/ip_set_hash_gen.h
> +++ b/net/netfilter/ipset/ip_set_hash_gen.h
> @@ -1543,8 +1543,8 @@ IPSET_TOKEN(HTYPE, _create)(struct net *net, struct ip_set *set,
>
> if (tb[IPSET_ATTR_HASHSIZE]) {
> hashsize = ip_set_get_h32(tb[IPSET_ATTR_HASHSIZE]);
> - if (hashsize < IPSET_MIMINAL_HASHSIZE)
> - hashsize = IPSET_MIMINAL_HASHSIZE;
> + if (hashsize < IPSET_MINIMAL_HASHSIZE)
> + hashsize = IPSET_MINIMAL_HASHSIZE;
> }
>
> if (tb[IPSET_ATTR_MAXELEM])
> --
> 2.49.0
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] netfilter: ipset: fix typo in hash size macro
2025-06-19 15:10 [PATCH] netfilter: ipset: fix typo in hash size macro RubenKelevra
2025-06-20 6:44 ` Jozsef Kadlecsik
@ 2025-06-20 9:20 ` RubenKelevra
2025-06-21 14:45 ` Jozsef Kadlecsik
1 sibling, 1 reply; 4+ messages in thread
From: RubenKelevra @ 2025-06-20 9:20 UTC (permalink / raw)
To: Jozsef Kadlecsik
Cc: Pablo Neira Ayuso, netfilter-devel, coreteam, netdev,
linux-kernel, RubenKelevra
Rename IPSET_MIMINAL_HASHSIZE → IPSET_MINIMAL_HASHSIZE in
ip_set_hash_gen.h, matching the header typo-fix.
Signed-off-by: RubenKelevra <rubenkelevra@gmail.com>
---
include/linux/netfilter/ipset/ip_set_hash.h | 2 +-
net/netfilter/ipset/ip_set_hash_gen.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/linux/netfilter/ipset/ip_set_hash.h b/include/linux/netfilter/ipset/ip_set_hash.h
index 838abab672af1..56e883661f857 100644
--- a/include/linux/netfilter/ipset/ip_set_hash.h
+++ b/include/linux/netfilter/ipset/ip_set_hash.h
@@ -6,7 +6,7 @@
#define IPSET_DEFAULT_HASHSIZE 1024
-#define IPSET_MIMINAL_HASHSIZE 64
+#define IPSET_MINIMAL_HASHSIZE 64
#define IPSET_DEFAULT_MAXELEM 65536
#define IPSET_DEFAULT_PROBES 4
#define IPSET_DEFAULT_RESIZE 100
diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
index 5251524b96afa..785d109645fed 100644
--- a/net/netfilter/ipset/ip_set_hash_gen.h
+++ b/net/netfilter/ipset/ip_set_hash_gen.h
@@ -1543,8 +1543,8 @@ IPSET_TOKEN(HTYPE, _create)(struct net *net, struct ip_set *set,
if (tb[IPSET_ATTR_HASHSIZE]) {
hashsize = ip_set_get_h32(tb[IPSET_ATTR_HASHSIZE]);
- if (hashsize < IPSET_MIMINAL_HASHSIZE)
- hashsize = IPSET_MIMINAL_HASHSIZE;
+ if (hashsize < IPSET_MINIMAL_HASHSIZE)
+ hashsize = IPSET_MINIMAL_HASHSIZE;
}
if (tb[IPSET_ATTR_MAXELEM])
--
2.49.0
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] netfilter: ipset: fix typo in hash size macro
2025-06-20 9:20 ` RubenKelevra
@ 2025-06-21 14:45 ` Jozsef Kadlecsik
0 siblings, 0 replies; 4+ messages in thread
From: Jozsef Kadlecsik @ 2025-06-21 14:45 UTC (permalink / raw)
To: RubenKelevra
Cc: Pablo Neira Ayuso, netfilter-devel, coreteam, netdev, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1853 bytes --]
Hello,
On Fri, 20 Jun 2025, RubenKelevra wrote:
> Rename IPSET_MIMINAL_HASHSIZE → IPSET_MINIMAL_HASHSIZE in
> ip_set_hash_gen.h, matching the header typo-fix.
>
> Signed-off-by: RubenKelevra <rubenkelevra@gmail.com>
Patch is applied in the ipset git tree, thank you.
Best regards,
Jozsef
> ---
> include/linux/netfilter/ipset/ip_set_hash.h | 2 +-
> net/netfilter/ipset/ip_set_hash_gen.h | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/netfilter/ipset/ip_set_hash.h b/include/linux/netfilter/ipset/ip_set_hash.h
> index 838abab672af1..56e883661f857 100644
> --- a/include/linux/netfilter/ipset/ip_set_hash.h
> +++ b/include/linux/netfilter/ipset/ip_set_hash.h
> @@ -6,7 +6,7 @@
>
>
> #define IPSET_DEFAULT_HASHSIZE 1024
> -#define IPSET_MIMINAL_HASHSIZE 64
> +#define IPSET_MINIMAL_HASHSIZE 64
> #define IPSET_DEFAULT_MAXELEM 65536
> #define IPSET_DEFAULT_PROBES 4
> #define IPSET_DEFAULT_RESIZE 100
> diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
> index 5251524b96afa..785d109645fed 100644
> --- a/net/netfilter/ipset/ip_set_hash_gen.h
> +++ b/net/netfilter/ipset/ip_set_hash_gen.h
> @@ -1543,8 +1543,8 @@ IPSET_TOKEN(HTYPE, _create)(struct net *net, struct ip_set *set,
>
> if (tb[IPSET_ATTR_HASHSIZE]) {
> hashsize = ip_set_get_h32(tb[IPSET_ATTR_HASHSIZE]);
> - if (hashsize < IPSET_MIMINAL_HASHSIZE)
> - hashsize = IPSET_MIMINAL_HASHSIZE;
> + if (hashsize < IPSET_MINIMAL_HASHSIZE)
> + hashsize = IPSET_MINIMAL_HASHSIZE;
> }
>
> if (tb[IPSET_ATTR_MAXELEM])
> --
> 2.49.0
>
>
--
E-mail : kadlec@netfilter.org, kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.hu
Address: Wigner Research Centre for Physics
H-1525 Budapest 114, POB. 49, Hungary
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-06-21 14:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-06-19 15:10 [PATCH] netfilter: ipset: fix typo in hash size macro RubenKelevra
2025-06-20 6:44 ` Jozsef Kadlecsik
2025-06-20 9:20 ` RubenKelevra
2025-06-21 14:45 ` Jozsef Kadlecsik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®