From nobody Fri Jun 14 15:29:24 2024 X-Original-To: dev-commits-src-all@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 4W139J5127z5P30P; Fri, 14 Jun 2024 15:29:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W139J4GyTz4kY6; Fri, 14 Jun 2024 15:29:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718378964; 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=qb0/z8uhH3D0xC/XbBzBMQDyxEGm8jOx1Jqu0EhoSBc=; b=G7pc6pU514s0wu3W864Rm212/R0rDjIzIrwtxg53adF1mzTcxjy1mjZcDGK5/oxRHa32o9 IkQHG1HqEJk1luoWvyhUge1aVyFFaUJLQF3ahf3lRPx5Tz2iogRgPylS07z7UjRMlxbo/U UIZk1LnqOIs2M8tOuLkxqV1sxLSsK34viQts5lMuIoxz3E+Z/15VcaMCHgemaPRfA+XMTh 589RO9Laqq9zdCzAIWdogsmEcX3U1Vnhtw3rUM2fH03dnHfjfOdrUEoACzvNsp6biCTNJl emkRiLX8E3bhAQWG+8nFHiwhWhNYiWBjwFJ68IZAm26ORXObq6LjB2hptCj5rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718378964; a=rsa-sha256; cv=none; b=Fe0YDgEfL7TgSM1KjBBjuhboceHAfrpgpkMYdKbvaxyE9oWIHK3EEbQxCPpz1Kb3Sif5vg bqwF++Pp335jY4ONIwwXyxPpC50gULrqDb0crdpP0TdXutl8GdgJStFw5hcCcBpdOy9LcX Bv3V5p6H2FtPtUR5sezx8esCiUkshJ0EG5WMFL+m5ojqgcta6vB4hRKjgLHLpNAKTqLgGB ly0CVTjNzOtI/Npd4k0maBvtnmlFnJPGkpMkiBAr0Glo0AOzdzgFComXIwS0mmPvVDy2Hg pSzsBkoPTttaWsbJSCJ77NrOpCd7YNE5MWaL0rSOQae5ku/cVP+Nh623ATII7A== 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=1718378964; 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=qb0/z8uhH3D0xC/XbBzBMQDyxEGm8jOx1Jqu0EhoSBc=; b=tKYqfxd4JusNhVh0wbTD6/wZIzgiZ8zbHanh9dGlAXmN9tzt81ZDgZC342833DKHikGB6+ xDQd+olCJsG0Ns4HqV9b0JX59I08DAi8Z2jqOgqbOHjTX/h/kPUiKUFL0WRjucNQODRYve 0H3A6V+HbTDC+X5FSXumHSKNi1zk12IPZThyiI0erH/n9sX2DOcurDJoHnE2VHLwDzFQeR /GaTt8GyZFpJNhXnhMzXRFLUYSXAmPEBcxFRE4Y1en5/9Zau8I3LYT5YYxJ0cWqv4XWGB+ 023Tmo7JT/ZPT3DxByIR2qM9v1xm1W2kHoL9AcOUf6/VYp9j0GLSkJGpqjRYdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W139J3t1ZzQmF; Fri, 14 Jun 2024 15:29:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45EFTOLV081352; Fri, 14 Jun 2024 15:29:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EFTOSd081349; Fri, 14 Jun 2024 15:29:24 GMT (envelope-from git) Date: Fri, 14 Jun 2024 15:29:24 GMT Message-Id: <202406141529.45EFTOSd081349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: de4bfd6b9987 - main - udp_var: correct intoudpcb macro unintended identifier dependency List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de4bfd6b9987987f82485e582beaa26338ed01d2 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=de4bfd6b9987987f82485e582beaa26338ed01d2 commit de4bfd6b9987987f82485e582beaa26338ed01d2 Author: Reid Linnemann AuthorDate: 2024-05-07 22:46:35 +0000 Commit: Kristof Provost CommitDate: 2024-06-14 15:28:28 +0000 udp_var: correct intoudpcb macro unintended identifier dependency Change 483fe9651 embedded struct inpcb into struct udpcb and updated the intoudpcb macro to use __containerof to locate it. This change accidentally introduced a dependency on the identifier inp being defined in the block the macro is expanded in. This should have been the macro argument ip. This change makes this simple correction. No functional change intended. Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netinet/udp_var.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h index 0d70bad91df4..2528e4fcb30f 100644 --- a/sys/netinet/udp_var.h +++ b/sys/netinet/udp_var.h @@ -120,7 +120,7 @@ struct udpcb { void *u_tun_ctx; /* Tunneling callback context. */ }; -#define intoudpcb(ip) __containerof((inp), struct udpcb, u_inpcb) +#define intoudpcb(ip) __containerof((ip), struct udpcb, u_inpcb) #define sotoudpcb(so) (intoudpcb(sotoinpcb(so))) VNET_PCPUSTAT_DECLARE(struct udpstat, udpstat);