The branch main has been updated by glebius:
URL:
https://cgit.FreeBSD.org/src/commit/?id=0b4539ee542f7011160c07bf52af7f16739f4a92
commit 0b4539ee542f7011160c07bf52af7f16739f4a92
Author: Gleb Smirnoff <gleb...@freebsd.org>
AuthorDate: 2024-11-14 19:39:13 +0000
Commit: Gleb Smirnoff <gleb...@freebsd.org>
CommitDate: 2024-11-14 19:39:13 +0000
inpcb: gc unused argument of in_pcbconnect()
---
sys/netinet/in_pcb.c | 3 +--
sys/netinet/in_pcb.h | 3 +--
sys/netinet/tcp_syncache.c | 2 +-
sys/netinet/tcp_usrreq.c | 2 +-
sys/netinet/udp_usrreq.c | 2 +-
sys/netinet6/udp6_usrreq.c | 2 +-
6 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 116ee149fecb..7c881817ac6e 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1005,8 +1005,7 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr_in
*sin, in_addr_t *laddrp,
* then pick one.
*/
int
-in_pcbconnect(struct inpcb *inp, struct sockaddr_in *sin, struct ucred *cred,
- bool rehash __unused)
+in_pcbconnect(struct inpcb *inp, struct sockaddr_in *sin, struct ucred *cred)
{
u_short lport, fport;
in_addr_t laddr, faddr;
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index a4b4075b3501..0cf5ca017963 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -661,8 +661,7 @@ int in_pcballoc(struct socket *, struct inpcbinfo *);
int in_pcbbind(struct inpcb *, struct sockaddr_in *, struct ucred *);
int in_pcbbind_setup(struct inpcb *, struct sockaddr_in *, in_addr_t *,
u_short *, struct ucred *);
-int in_pcbconnect(struct inpcb *, struct sockaddr_in *, struct ucred *,
- bool);
+int in_pcbconnect(struct inpcb *, struct sockaddr_in *, struct ucred *);
int in_pcbconnect_setup(struct inpcb *, struct sockaddr_in *, in_addr_t *,
u_short *, in_addr_t *, u_short *, struct ucred *);
void in_pcbdisconnect(struct inpcb *);
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index d0068a9d313b..606d808676e1 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -898,7 +898,7 @@ syncache_socket(struct syncache *sc, struct socket *lso,
struct mbuf *m)
sin.sin_port = sc->sc_inc.inc_fport;
bzero((caddr_t)sin.sin_zero, sizeof(sin.sin_zero));
INP_HASH_WLOCK(&V_tcbinfo);
- error = in_pcbconnect(inp, &sin, thread0.td_ucred, false);
+ error = in_pcbconnect(inp, &sin, thread0.td_ucred);
INP_HASH_WUNLOCK(&V_tcbinfo);
if (error != 0)
goto abort;
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 9a6e80363f0c..b5725eb1ce86 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -1471,7 +1471,7 @@ tcp_connect(struct tcpcb *tp, struct sockaddr_in *sin,
struct thread *td)
return (EISCONN);
INP_HASH_WLOCK(&V_tcbinfo);
- error = in_pcbconnect(inp, sin, td->td_ucred, true);
+ error = in_pcbconnect(inp, sin, td->td_ucred);
INP_HASH_WUNLOCK(&V_tcbinfo);
if (error != 0)
return (error);
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 9dad79e95b04..30c8fff5ea94 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -1648,7 +1648,7 @@ udp_connect(struct socket *so, struct sockaddr *nam,
struct thread *td)
}
NET_EPOCH_ENTER(et);
INP_HASH_WLOCK(pcbinfo);
- error = in_pcbconnect(inp, sin, td->td_ucred, true);
+ error = in_pcbconnect(inp, sin, td->td_ucred);
INP_HASH_WUNLOCK(pcbinfo);
NET_EPOCH_EXIT(et);
if (error == 0)
diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c
index 414be35b5bef..c52c808a3299 100644
--- a/sys/netinet6/udp6_usrreq.c
+++ b/sys/netinet6/udp6_usrreq.c
@@ -1151,7 +1151,7 @@ udp6_connect(struct socket *so, struct sockaddr *nam,
struct thread *td)
inp->inp_vflag &= ~INP_IPV6;
NET_EPOCH_ENTER(et);
INP_HASH_WLOCK(pcbinfo);
- error = in_pcbconnect(inp, &sin, td->td_ucred, true);
+ error = in_pcbconnect(inp, &sin, td->td_ucred);
INP_HASH_WUNLOCK(pcbinfo);
NET_EPOCH_EXIT(et);
/*
