[PATCH nf-next 0/4] netfilter: replace u_int*_t with kernel int types (batch 3)

[PATCH nf-next 0/4] netfilter: replace u_int*_t with kernel int types (batch 3)

[Carlos Grillet]

This patch series replaces POSIX u_int8_t/u_int16_t/u_int32_t with the
preferred kernel types u8/u16/u32 across several netfilter files and
updates the corresponding header definition.

This continues the work started in:
https://lore.kernel.org/all/20260616182948.96865-1-carlos@carlosgrillet.me

No functional changes.

Carlos Grillet (4):
  netfilter: ip_vs_core: replace u_int32_t with u32
  netfilter: nf_conntrack_sip: replace u_int16_t with u16
  netfilter: nf_nat_amanda: replace u_int16_t with u16
  netfilter: nfnetlink_osf: replace u_int8_t with u8

 include/linux/netfilter/nfnetlink_osf.h | 2 +-
 net/netfilter/ipvs/ip_vs_core.c         | 2 +-
 net/netfilter/nf_conntrack_sip.c        | 2 +-
 net/netfilter/nf_nat_amanda.c           | 2 +-
 net/netfilter/nfnetlink_osf.c           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

-- 
2.55.0

[PATCH nf-next 1/4] netfilter: ip_vs_core: replace u_int32_t with u32

[Carlos Grillet]

Use preferred kernel integer type u32 instead of the POSIX u_int32_t
variant.

No functional change.

Signed-off-by: Carlos Grillet <carlos@carlosgrillet.me>
---
 net/netfilter/ipvs/ip_vs_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index d40b404c1bf6..1ae997660148 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -882,7 +882,7 @@ static inline enum ip_defrag_users ip_vs_defrag_user(unsigned int hooknum)
 }
 
 static inline int ip_vs_gather_frags(struct netns_ipvs *ipvs,
-				     struct sk_buff *skb, u_int32_t user)
+				     struct sk_buff *skb, u32 user)
 {
 	int err;
 
-- 
2.55.0

[PATCH nf-next 2/4] netfilter: nf_conntrack_sip: replace u_int16_t with u16

[Carlos Grillet]

Use preferred kernel integer type u16 instead of the POSIX u_int16_t
variant.

No functional change.

Signed-off-by: Carlos Grillet <carlos@carlosgrillet.me>
---
 net/netfilter/nf_conntrack_sip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index 0ff089e03891..87c9c6b92a6d 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -935,7 +935,7 @@ static int set_expected_rtp_rtcp(struct sk_buff *skb, unsigned int protoff,
 	union nf_inet_addr *saddr;
 	struct nf_conntrack_tuple tuple;
 	int direct_rtp = 0, skip_expect = 0, ret = NF_DROP;
-	u_int16_t base_port;
+	u16 base_port;
 	__be16 rtp_port, rtcp_port;
 	const struct nf_nat_sip_hooks *hooks;
 	struct nf_conn_help *help;
-- 
2.55.0

[PATCH nf-next 3/4] netfilter: nf_nat_amanda: replace u_int16_t with u16

[Carlos Grillet]

Use preferred kernel integer type u16 instead of the POSIX u_int16_t
variant.

No functional change.

Signed-off-by: Carlos Grillet <carlos@carlosgrillet.me>
---
 net/netfilter/nf_nat_amanda.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/nf_nat_amanda.c b/net/netfilter/nf_nat_amanda.c
index 8f1054920a85..fe054cb4fc0b 100644
--- a/net/netfilter/nf_nat_amanda.c
+++ b/net/netfilter/nf_nat_amanda.c
@@ -33,7 +33,7 @@ static unsigned int help(struct sk_buff *skb,
 			 struct nf_conntrack_expect *exp)
 {
 	char buffer[sizeof("65535")];
-	u_int16_t port;
+	u16 port;
 
 	/* Connection comes from client. */
 	exp->saved_proto.tcp.port = exp->tuple.dst.u.tcp.port;
-- 
2.55.0

[PATCH nf-next 4/4] netfilter: nfnetlink_osf: replace u_int8_t with u8

[Carlos Grillet]

Use preferred kernel integer type u8 instead of the POSIX u_int8_t
variant and update the corresponding header definition.

No functional change.

Signed-off-by: Carlos Grillet <carlos@carlosgrillet.me>
---
 include/linux/netfilter/nfnetlink_osf.h | 2 +-
 net/netfilter/nfnetlink_osf.c           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/netfilter/nfnetlink_osf.h b/include/linux/netfilter/nfnetlink_osf.h
index 788613f36935..d720abf59ca8 100644
--- a/include/linux/netfilter/nfnetlink_osf.h
+++ b/include/linux/netfilter/nfnetlink_osf.h
@@ -26,7 +26,7 @@ struct nf_osf_data {
 	const char *version;
 };
 
-bool nf_osf_match(const struct sk_buff *skb, u_int8_t family,
+bool nf_osf_match(const struct sk_buff *skb, u8 family,
 		  int hooknum, struct net_device *in, struct net_device *out,
 		  const struct nf_osf_info *info, struct net *net,
 		  const struct list_head *nf_osf_fingers);
diff --git a/net/netfilter/nfnetlink_osf.c b/net/netfilter/nfnetlink_osf.c
index 92002079f8ea..88382e2108eb 100644
--- a/net/netfilter/nfnetlink_osf.c
+++ b/net/netfilter/nfnetlink_osf.c
@@ -179,7 +179,7 @@ static const struct tcphdr *nf_osf_hdr_ctx_init(struct nf_osf_hdr_ctx *ctx,
 }
 
 bool
-nf_osf_match(const struct sk_buff *skb, u_int8_t family,
+nf_osf_match(const struct sk_buff *skb, u8 family,
 	     int hooknum, struct net_device *in, struct net_device *out,
 	     const struct nf_osf_info *info, struct net *net,
 	     const struct list_head *nf_osf_fingers)
-- 
2.55.0

Re: [PATCH nf-next 0/4] netfilter: replace u_int*_t with kernel int types (batch 3)

[Florian Westphal]

Carlos Grillet <carlos@carlosgrillet.me> wrote:
> This patch series replaces POSIX u_int8_t/u_int16_t/u_int32_t with the
> preferred kernel types u8/u16/u32 across several netfilter files and
> updates the corresponding header definition.
> 
> This continues the work started in:
> https://lore.kernel.org/all/20260616182948.96865-1-carlos@carlosgrillet.me
> 
> No functional changes.
> 
> Carlos Grillet (4):
>   netfilter: ip_vs_core: replace u_int32_t with u32

This one is fine, its the only occurence.

>   netfilter: nf_conntrack_sip: replace u_int16_t with u16

No need to send a v2, I "fixed" this locally, but this
could have been
'netfilter: nf_conntrack: replace u_int16_t with u16'

 nf_conntrack_core.c    |    4 ++--
 nf_conntrack_irc.c     |    4 ++--
 nf_conntrack_netlink.c |    6 +++---
 nf_conntrack_pptp.c    |    8 ++++----
 nf_conntrack_sip.c     |    2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

>   netfilter: nf_nat_amanda: replace u_int16_t with u16
>   netfilter: nfnetlink_osf: replace u_int8_t with u8

I'm not applying these two.  Please find a way to make
larger logical changesets.

These one-lines are just extra churn.
E.g. make one patch for nf_nat.

Or address all of u8/18/u32 in same change.