git: 3ff24c76c140 - main - inpcb: remove unneeded #ifdef INET || INET6
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 15 Jul 2026 02:17:32 UTC
The branch main has been updated by glebius:
URL: https://cgit.FreeBSD.org/src/commit/?id=3ff24c76c140d5c533915caecfe4af201126f243
commit 3ff24c76c140d5c533915caecfe4af201126f243
Author: Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2026-07-15 02:13:25 +0000
Commit: Gleb Smirnoff <glebius@FreeBSD.org>
CommitDate: 2026-07-15 02:13:25 +0000
inpcb: remove unneeded #ifdef INET || INET6
Per sys/conf/files this unit is not compiled for a NOIP kernel.
---
sys/netinet/in_pcb.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 7a9e327893ca..8be91dc3eca2 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -82,7 +82,6 @@
#include <net/rss_config.h>
#include <net/vnet.h>
-#if defined(INET) || defined(INET6)
#include <netinet/in.h>
#include <netinet/in_pcb.h>
#include <netinet/in_pcb_var.h>
@@ -97,9 +96,8 @@
#include <netinet6/in6_pcb.h>
#include <netinet6/in6_var.h>
#include <netinet6/ip6_var.h>
-#endif /* INET6 */
-#include <net/route/nhop.h>
#endif
+#include <net/route/nhop.h>
#include <netipsec/ipsec_support.h>
@@ -723,7 +721,6 @@ out:
#endif
}
-#if defined(INET) || defined(INET6)
/*
* Assign a local port like in_pcb_lport(), but also used with connect()
* and a foreign address and port. If fsa is non-NULL, choose a local port
@@ -880,7 +877,6 @@ in_pcb_lport(struct inpcb *inp, struct in_addr *laddrp, u_short *lportp,
return (in_pcb_lport_dest(inp, laddrp ? (struct sockaddr *) &laddr :
NULL, lportp, NULL, 0, cred, lookupflags));
}
-#endif /* INET || INET6 */
#ifdef INET
/*