From nobody Thu Nov 10 19:15:16 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 4N7WkX6MKqz4dntB; Thu, 10 Nov 2022 19:15:16 +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 4N7WkX5mgsz41Wj; Thu, 10 Nov 2022 19:15:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668107716; 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=suQIEzgbsYPc5+BsoHMZIvjzcG+bsUg35hCSSNq9mxU=; b=hqE5di+38fxCcBR9okaIanlPjFzCro+LaVpq2DAFr1nAdNmONkIVQu5G2BF24xT3H8/589 v/CKe8E7XBPdxrbVzbsACEM6Nw/c1kIXGAUJvi1rnmKYw7xv8xn4zsGG2dMRAEWPqlgUG/ B8LcefNBnZMFMWPnAbWUd1JuZFLfhVC65iO9BqNCEwNA3o5xUrQWOKe/PRzgyl0Jty/HoZ 85iPN/D6IrJaLQjYVW1bwrv/MROyqz8/10QGNS75DU+mC0i7w3GAkHGMABxX5Uhtg0Utai wpJLPQbX24Ienf7YLhUTYCuVd1GXpokfpWk4hiu5HSoGGsAfxeTBamp4YsC4PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668107716; 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=suQIEzgbsYPc5+BsoHMZIvjzcG+bsUg35hCSSNq9mxU=; b=T4IFKcXakxRkB9YBN5xyzR/vbfxVhrJDLgIhJyNdEf5gVg2dEKSJFsYlrFs17XAM6RPldB 5/elzRCzd14+sFn0dKyPYF9upMwLU0B7q9ClYmreexPQKmTRFQPbtOZ5DS5gxgY0vgGJpp jcac7jSj/u19PZLDI/VPfakplj4QB1uSQ2JaS5fUIMcKcMLIpL6vdywO862WYddFBb9aTf 5ZwXQoAF6mQiDbfvo2cmA+6vXHUQ4N2Cj2+tItz7FPMUGlYMSZHrgh5UXqd7bHUor5DMWj skIbP7csp+zihEho8jvG2XgJgoqnZVW42PhG2xHSEx1JIvVBXu2waamyG7RJWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668107716; a=rsa-sha256; cv=none; b=JTHS24O4zH8tfJG/b6hnaEo4gPcvfvKLdlIzz8ZSJCSfe6Z4aRcG95f/TykmsmtPcgxNcB 8Se3EBvMlI/T8Hoe0boC1Ku6FRopsi1ExnYdQzX/65Tp5RMtacCnJTnYK4JHfT5lFNFbnc 3QyfljzvBVbTTMwenOgJP8BPOfjxLcFWqXc7ECR4uLST7lok7/2A1jFpR632dvqrINJ0FA 8YN5V4XF8LBGrViD31NQV2VUR0NPq6yvn2PonCM56u/YLriTSL5efJkgZ7qhZ2TfRXe98b 2g7HMOjuxDhevG2a/maZDn2y1A6I8ehBc6JyM74kwcdS9QCI+59zr7CDoqrU7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N7WkX4rbyz1CXT; Thu, 10 Nov 2022 19:15:16 +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 2AAJFGaD001004; Thu, 10 Nov 2022 19:15:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AAJFGKE001003; Thu, 10 Nov 2022 19:15:16 GMT (envelope-from git) Date: Thu, 10 Nov 2022 19:15:16 GMT Message-Id: <202211101915.2AAJFGKE001003@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 7affe1db3735 - stable/13 - Group all compat shim structures together to consolidate #ifdef's. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7affe1db37359647cf77ad330f391b506a0dba09 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7affe1db37359647cf77ad330f391b506a0dba09 commit 7affe1db37359647cf77ad330f391b506a0dba09 Author: John Baldwin AuthorDate: 2021-05-05 20:59:09 +0000 Commit: John Baldwin CommitDate: 2022-11-10 18:26:14 +0000 Group all compat shim structures together to consolidate #ifdef's. Reviewed by: brooks, kib Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D29894 (cherry picked from commit 9c87db4b3c5b119809c7ff12d20ecbfd62f01996) --- sys/net/if.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index ae7b1087c249..1f768ed1d4aa 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -148,6 +148,15 @@ CTASSERT(sizeof(struct ifreq) == sizeof(struct ifreq32)); CTASSERT(__offsetof(struct ifreq, ifr_ifru) == __offsetof(struct ifreq32, ifr_ifru)); +struct ifconf32 { + int32_t ifc_len; + union { + uint32_t ifcu_buf; + uint32_t ifcu_req; + } ifc_ifcu; +}; +#define SIOCGIFCONF32 _IOWR('i', 36, struct ifconf32) + struct ifdrv32 { char ifd_name[IFNAMSIZ]; uint32_t ifd_cmd; @@ -2900,16 +2909,6 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) return (error); } -#ifdef COMPAT_FREEBSD32 -struct ifconf32 { - int32_t ifc_len; - union { - uint32_t ifcu_buf; - uint32_t ifcu_req; - } ifc_ifcu; -}; -#define SIOCGIFCONF32 _IOWR('i', 36, struct ifconf32) -#endif /* * Interface ioctls. */