Date: Sun, 12 Apr 2026 18:35:41 +0000 From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 1d0ea3dfb9cb - main - raw ip: remove extra argument to rip_dodisconnect() Message-ID: <69dbe5fd.3a4df.19606b1e@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=1d0ea3dfb9cbc26e77491bacef1cbc5d72e0375d commit 1d0ea3dfb9cbc26e77491bacef1cbc5d72e0375d Author: Gleb Smirnoff <glebius@FreeBSD.org> AuthorDate: 2026-04-12 18:34:05 +0000 Commit: Gleb Smirnoff <glebius@FreeBSD.org> CommitDate: 2026-04-12 18:34:05 +0000 raw ip: remove extra argument to rip_dodisconnect() No functional change. --- sys/netinet/raw_ip.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index f2fec876d077..5114a69d7bf2 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -871,7 +871,7 @@ rip_detach(struct socket *so) } static void -rip_dodisconnect(struct socket *so, struct inpcb *inp) +rip_dodisconnect(struct inpcb *inp) { struct inpcbinfo *pcbinfo; @@ -882,9 +882,9 @@ rip_dodisconnect(struct socket *so, struct inpcb *inp) inp->inp_faddr.s_addr = INADDR_ANY; rip_inshash(inp); INP_HASH_WUNLOCK(pcbinfo); - SOCK_LOCK(so); - so->so_state &= ~SS_ISCONNECTED; - SOCK_UNLOCK(so); + SOCK_LOCK(inp->inp_socket); + inp->inp_socket->so_state &= ~SS_ISCONNECTED; + SOCK_UNLOCK(inp->inp_socket); INP_WUNLOCK(inp); } @@ -896,7 +896,7 @@ rip_abort(struct socket *so) inp = sotoinpcb(so); KASSERT(inp != NULL, ("rip_abort: inp == NULL")); - rip_dodisconnect(so, inp); + rip_dodisconnect(inp); } static void @@ -907,7 +907,7 @@ rip_close(struct socket *so) inp = sotoinpcb(so); KASSERT(inp != NULL, ("rip_close: inp == NULL")); - rip_dodisconnect(so, inp); + rip_dodisconnect(inp); } static int @@ -921,7 +921,7 @@ rip_disconnect(struct socket *so) inp = sotoinpcb(so); KASSERT(inp != NULL, ("rip_disconnect: inp == NULL")); - rip_dodisconnect(so, inp); + rip_dodisconnect(inp); return (0); }home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69dbe5fd.3a4df.19606b1e>