From nobody Sat Sep 10 20:41:03 2022 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 4MQ4Wg6gdFz4bxNk; Sat, 10 Sep 2022 20:41:03 +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 4MQ4Wg6DSGz3sXf; Sat, 10 Sep 2022 20:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662842463; 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=jEUy7VvXk1sESAp79KCyA/9bH64thCXiHNDXN7Ng+dU=; b=ZJTmyUG24JSjqmu6bOV0R3QxYKQuYeo4xZrgfgV/ojVNw13jdvVZ8AOZuGzafENA486cMF JRBAvJ+h4Y+5a01zBrz1qc/cz+ChcbDSctYKyubuVIVr5jX723xUxIkcws0+qjdWhQQPnx GlsI3hBRIqugzc/F4Ra0IxAX6wC8mQ8x7X4PVTTKLl8LEHgRwb04GXsznD2lxDO9H49zbH RhIJnt3JYdI3GeZlpzDW203JAOq3p3ZaJpmdxJThM948N4QTIAxPYb1qi55REUraX5rZTL 0QcJIZuUQfnrVscyKJhk8Ve3ZP0uiIQDJn8S+AXwE5a0pk497aFncyqxiQRHmA== 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 4MQ4Wg5GlXzQRD; Sat, 10 Sep 2022 20:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28AKf38Z005988; Sat, 10 Sep 2022 20:41:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28AKf36m005987; Sat, 10 Sep 2022 20:41:03 GMT (envelope-from git) Date: Sat, 10 Sep 2022 20:41:03 GMT Message-Id: <202209102041.28AKf36m005987@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 1760a6950a70 - main - Fixup build after recent getsock changes 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1760a6950a70b8459d9d637bd7ba786f60f080d3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662842463; 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=jEUy7VvXk1sESAp79KCyA/9bH64thCXiHNDXN7Ng+dU=; b=PPstr/cb0ZGkqIODNYJQU64htXKMPKCPeTDHEyvMa9aUY7So6CaI6BEcbIyY0okmCpabzF 5z06ZVCTs1XMVVxTs/Nv3X9ycshmRC1acrZBtJ5VDoVL/xr3N0z1BL5ymqwLiceETQ0J7s RLOzCVgCVZDPhl6mvqLgrcecNpJZ8YxOt+ECU4tU40pWRYey9SNDxEDA9+S0WkvdvuL82s EI8MoocePifdBX0Lcjc/XoPY2uj4wlvTlefs0CduyHD5OJ4B7Z9gatzjgHJVUUpopK5ZMG CrVSoIwXHyrbQwR0OPcs2Khcwi0JmvdNJJ6WV+8DtRy9E7o5RcasRqJ7Qm8h8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662842463; a=rsa-sha256; cv=none; b=r/Ti+DFtTaCKWj9szytxH7X586q6p6/48hbDow9n7HLFh7JSmbf4L0Hl1irMkAM3Yf6Jzc K/cz6NF++2jNE016gnJV1UoMl7IsIaMC60sJVrUsaqjLytibADryPbMSg9le7ROb2FtpB9 EpWRPwZ/G7vaFFEocbdiJUmfuvbtqpQw9s6MTxs2eT1CgcquGNLWV8O6d02nn0ihP7uo/1 qBhI+vV6I4qkLNFNcc9hgg6cGve3yaa7DhiJTP/XQ8gC0lZRbHN4uUeEzV4c6XEOU7TH9I GULI8QdzznDrpHP3WO6eJ53aYxpzpPRU717QOq7+xdZLXiqhBqgEggMw2Rt2Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=1760a6950a70b8459d9d637bd7ba786f60f080d3 commit 1760a6950a70b8459d9d637bd7ba786f60f080d3 Author: Mateusz Guzik AuthorDate: 2022-09-10 20:40:32 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-10 20:40:43 +0000 Fixup build after recent getsock changes --- sys/kern/uipc_syscalls.c | 2 +- sys/netinet/sctp_syscalls.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index c2ba9535472a..9c5c9719c204 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -348,7 +348,7 @@ kern_accept4(struct thread *td, int s, struct sockaddr **name, &headfp, &fcaps); if (error != 0) return (error); - fflag = atomic_load_int(&fp->f_flag); + fflag = atomic_load_int(&headfp->f_flag); head = headfp->f_data; if (!SOLISTENING(head)) { error = EINVAL; diff --git a/sys/netinet/sctp_syscalls.c b/sys/netinet/sctp_syscalls.c index a58ba9c231f3..5ae1da98e5da 100644 --- a/sys/netinet/sctp_syscalls.c +++ b/sys/netinet/sctp_syscalls.c @@ -157,7 +157,7 @@ sys_sctp_peeloff(td, uap) &headfp); if (error != 0) goto done2; - fflag = atomic_load_int(&fp->f_flag); + fflag = atomic_load_int(&headfp->f_flag); head = headfp->f_data; if (head->so_proto->pr_protocol != IPPROTO_SCTP) { error = EOPNOTSUPP;