From nobody Mon May 30 15:10:59 2022 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 894191B4D8FD; Mon, 30 May 2022 15:10:59 +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 4LBf4M3Dpfz4X9m; Mon, 30 May 2022 15:10:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653923459; 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=pU/d4nMnYfp0GJZQipbU+3LY2ySRaTB62mKwGjMX6rE=; b=A9az1OJZB7lLg9RKfhswUYHAP1TdPFkewH/Z/FSmnWbnA3PTwAVREk9NrYbmP4vi2WWQ0Y 5GfY/0whqiLCjhBIEgDyvWL8wa3PSiQCVcyci7TFRVk6xUqZ79v/0ojBSpUk6Bo+vTP9iU FkfeE5aj/EJnE4NC0FqCY4Ke+3a7Wone59xNo2bAhXEzYZoYSpR434M4ElhamNAY+9/TTL QT0drZ2osvMt4pFP017DwJOYkNTJq2i1tqHmlScSQ+lqkpRMzpGkgeZq66nHT080Zf7Ara tfrM5U8M2znDOaQRazDNkICiAfaWvmshS6fwD4ce0CVnFd5Wnh0RHCwuAOnCDg== 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 500DB199C2; Mon, 30 May 2022 15:10:59 +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 24UFAxbZ014260; Mon, 30 May 2022 15:10:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24UFAxvj014259; Mon, 30 May 2022 15:10:59 GMT (envelope-from git) Date: Mon, 30 May 2022 15:10:59 GMT Message-Id: <202205301510.24UFAxvj014259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 8c0d1eca7834 - main - sockbuf: retain backward compatibility with userland after d59bc188d652 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c0d1eca7834bfd5a05c86bf20a7600917057492 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653923459; 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=pU/d4nMnYfp0GJZQipbU+3LY2ySRaTB62mKwGjMX6rE=; b=GmVb84cXr3g13pZZQ79a65vALx4JJt5uCxDKDBORU+0i/osYBvrTLIvtNugvzu+i26Vi3A E3LHwrkTjw0z3gn0yFHuAtAlrpjccPuswV2aGGFzvMs3a6AuLog8PFzWiT5XirMzfZ/hQi u7C06ZKU/JTCIdfGriFK87gwPM6X31bOmLuK3sZFz5TArRA1HzDZNasVZQvWTBSItgdUYG plYTqfLZC6Qylokr7E4szuTHJ7XvnlF1YGuk3t+hyywSjvFkyIXr3EO7HR5zxbaHOWDCWp HMdsAqQjVEgRSAXKr7g7AQO3ljU7sWv/hMUn0pcpCG70HF7x492q3Z+lRS1OkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653923459; a=rsa-sha256; cv=none; b=N55CfVMmfKRUE6jclNs6GhlP+DC0u7C3d7JrctJ5tLl06rFmmH6VAHvHhjSmbPGWDH0zvD QyJCNeVC74uTimU0jd2dDr2D73x5/WkMBRA8zduGm88m9MAJhGQs+e9ucs4eYA8aNtJOLf 0F6zDA34s78OH5dPLwXSk7Y/4gpBwb8AgKRqxZf5zf0JHZWMi6m1YUArTdKne1IuiuhXGQ H2+ur0kJxp1cX6f+NO7FYlau9XFlWlViGYbB3mGNGfF8K/VoVwcs4c6QzccjMH+NHFNaHy 0+18MGoswkZpQmKCcqivAsxcP7c6OGV+4q1m5oAY5Nafy6/iPD21YIAmOq1XIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=8c0d1eca7834bfd5a05c86bf20a7600917057492 commit 8c0d1eca7834bfd5a05c86bf20a7600917057492 Author: Alexander V. Chernikov AuthorDate: 2022-05-30 14:56:25 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-05-30 15:10:53 +0000 sockbuf: retain backward compatibility with userland after d59bc188d652 Add spare fields to xsockbuf in place of sb_mcnt / sb_ccnt to avoid rebuilding userland binaries like sockstat(1). Reviewed by: glebius --- sys/sys/socketvar.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 52b9376f0559..249e0800f915 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -577,6 +577,8 @@ struct xsocket { uint32_t sb_cc; uint32_t sb_hiwat; uint32_t sb_mbcnt; + uint32_t sb_spare0; /* was sb_mcnt */ + uint32_t sb_spare1; /* was sb_ccnt */ uint32_t sb_mbmax; int32_t sb_lowat; int32_t sb_timeo;