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@xxxxxxxxx>
---
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
