From nobody Sun Apr 12 18:35:41 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftzkP6cVtz6YW2g for ; Sun, 12 Apr 2026 18:35:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftzkP2Gfmz3b5H for ; Sun, 12 Apr 2026 18:35:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776018941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pv2VdUDNWwm5nHUO6pF4YtWfb0pHnB7cNywn+QdIDKE=; b=UI6v/+P6PWHh+5diV5/U1nguih+7in221H9Yzu85T8MqlS4HkXuNUB4n2V6uRKU0Eoq3l4 rY65unAyYU6v/W82dGYrPNBOzvBlyLV5JA+E46wyASPBG4dpzCkAYT3KK8R+L5nMbii98b b6iaEhlTZMk0rkzJh+Css9qTMf2luRyrH4HIYwfBtfLJL+hOg8LnvYT5n0ovIR+VN8D0F4 za0xcX6QVOpiySjybAKmEaia5oLdnLv54/HUEWMnti9cz2ugd9FOeDYvLKfi3V9eunR7o7 FzjsVJB94bdEOsjf/D0EkBPOjIi3Tbr6kvqy7Tc0g1lHUhE2NHqFtxo0RSE9OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776018941; a=rsa-sha256; cv=none; b=d0uPbABt7SLLudKUYmUZ1Bx9SHvftM57zk/uBI3KZMQSuNtRH9mEMBsSX/erIVOpg9Ufle ZNXPa+XhY10JKpEdVrjUS6MhwuI0bZr2J6uPOjyD+O0cRIfBC4er0Wmp6oKKHEa45RknFH 1Pn7A/Wwwd25uboTxdoXg1h/Ukik8XHeL2f2QrFNozsDFxB9WgA7V/Gsj+Qft8DPLuAB0X uU0/vf4vdeGe4yDZECQ234kP70aQ03pVUv4CbzrFaLXD62z9w/CxEWXtfxf3KLzYZFj+9I ICY/azYqblsXusVFP2Y9rn3TFihNf+auX3lTVAZ1fqGx/FdskqFKNY3swbwV8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776018941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pv2VdUDNWwm5nHUO6pF4YtWfb0pHnB7cNywn+QdIDKE=; b=FDOLGmMo3DBE/AgIgyHHEkJ/y9zBnEJbhtCo1guL6O2+uzwDWydGbjmf0H1tYQNsnQ9rQ6 FnLs5FW62XZ12dXGQtFhIXQVFmzGyuWgsVGSZ/Uuxa+sIg4zuZZfB/4hUfksm6uOJsdGMf E7dk42An6ATsAb9mmz7LERMQt8nvgYnqDimgQ1tarAuVd4bWvyMaFW24zIexAlpefnoJOr 5uJFHJ5+BZHPVM1tkN+BfBvJHg/q0xAhENjXHzB8YQwfJWPxfRmrWeBSIrxv78U5waLXjI LPxJm9rIF4llUmWIPgTT9Y+zYR9MNqr9xAr4wsQXhJUyUm776UytXS3bVuu5lQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftzkP0HlbzDDP for ; Sun, 12 Apr 2026 18:35:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a4df by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 18:35:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 1d0ea3dfb9cb - main - raw ip: remove extra argument to rip_dodisconnect() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d0ea3dfb9cbc26e77491bacef1cbc5d72e0375d Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 18:35:41 +0000 Message-Id: <69dbe5fd.3a4df.19606b1e@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=1d0ea3dfb9cbc26e77491bacef1cbc5d72e0375d commit 1d0ea3dfb9cbc26e77491bacef1cbc5d72e0375d Author: Gleb Smirnoff AuthorDate: 2026-04-12 18:34:05 +0000 Commit: Gleb Smirnoff 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); }