From nobody Mon Feb 21 14:58:06 2022 X-Original-To: dev-commits-src-branches@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 5970119CB5AF; Mon, 21 Feb 2022 14:58:07 +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 4K2QQl21xHz3vHY; Mon, 21 Feb 2022 14:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645455487; 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=cy/jDXBQugoxuUU31z9d46ROhoDUCU0tPdlArTNjHuY=; b=pG1YApUYJJEuNcQl/gsU/0KQUr5NVijYXwSmflM0Pk7ssR8L/j7ln2Gq0gRVDyTofjlNXq sMiARjsdXdN/i2mK0GtLhoc4uCypWHEHzp21Fpr/9ebNwCITtppq9qDovN3GLGKX361xX5 fa38nR97wIo8ZTd8wEzTBkYty9TCrjzCP0GOxP2PyaVkni5h2UDd9mScRHhBk/vth/fToK 4VwPyS3qq5JlmfxflUgb8vII3LFS60H562PrXYMz1KoaEovK+1olUcZsGCBT9maEeSavgJ mW9sYOJXUG2R1rdsxdzyHzVjgFeBPkUeopFIKW/omkd96tJ/shtQzH5quI2Y7Q== 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 214ED1222B; Mon, 21 Feb 2022 14:58:07 +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 21LEw699086105; Mon, 21 Feb 2022 14:58:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LEw6Q3086104; Mon, 21 Feb 2022 14:58:06 GMT (envelope-from git) Date: Mon, 21 Feb 2022 14:58:06 GMT Message-Id: <202202211458.21LEw6Q3086104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 59e095633d5b - stable/13 - tcp: Avoid conditionally defined fields in union lro_address List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 59e095633d5b953a96118af4b7dee1263e8d10ba Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645455487; 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=cy/jDXBQugoxuUU31z9d46ROhoDUCU0tPdlArTNjHuY=; b=ZOE72fWD1/2dvGYzLEH14VL2QljDPaz0MCAZKopUnusFGURJH8NU7hqV06cXfrvUC6TSeZ 857J+dj0ow+5tceB01/q2cgXjcVwYBPCtlDwcbJc3k0mD2ZFXGqeb7S1YAd/rVz2O5ubjw 9B2SuNIA/02gaXe8Rp6/UthLsBRlyj+PKRUzlBtAdckAAUJGIIlBZKJuArxfoAcS3KDvxW FaVkzxF7PGprwFTKRDg0YaJP7Psr5NEXtbM1lWpQud58iVGeduI6Ll4k7m9haTULl7vwoy 4WgBpysssoVGzSRCe6m1yJqicn/ltnAQjSkUpO7l1bmlK272TINzMkW6C5GBzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645455487; a=rsa-sha256; cv=none; b=GmzOE7vgr82ZEUPlxHKPpLyH5N0CpV87aOKuwYjA0pu3wevtTnhf48mtEZmIUWSUnF65IZ zPf5kn33FpMkoO260pdA9QM2NFGKfzsIR5S+8TZaJSW1r5zd38V2K6NQoTWhPo6stTksMt puaNt3nA02ZQX/QOuCas5iVmCCAx9SmAbnYRa9eyLaA8yd1QBMCr6HhZpB2FLZBbKVzkSD cUuyYfGVhc0oJHOlbWnPjQTl8H5G7OO6sDScA8ZSA2m0E3MhHyQHqeRGtUEwDZG8fzspy6 CoftUqIxbLRBw3cDw9w/uBf6DYOPi4CYKAiBBRZm7mGboh9MzM6a2Z2d6RugZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=59e095633d5b953a96118af4b7dee1263e8d10ba commit 59e095633d5b953a96118af4b7dee1263e8d10ba Author: Mark Johnston AuthorDate: 2022-02-10 20:31:26 +0000 Commit: Mark Johnston CommitDate: 2022-02-21 14:57:04 +0000 tcp: Avoid conditionally defined fields in union lro_address The layout of the structure ends up depending on whether the including file includes opt_inet.h and opt_inet6.h, so different compilation units can end up seeing different versions of the structure. Fix this by unconditionally defining the address fields. As a side effect, this eliminates some duplication in the kernel's CTF type graph. Reviewed by: rscheff, tuexen Sponsored by: The FreeBSD Foundation (cherry picked from commit b4f60fab5d3fdd2ea51c1151fa79b2c541c6b81a) --- sys/netinet/tcp_lro.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sys/netinet/tcp_lro.h b/sys/netinet/tcp_lro.h index b8abc2fa1ab3..82cf1af218d6 100644 --- a/sys/netinet/tcp_lro.h +++ b/sys/netinet/tcp_lro.h @@ -34,6 +34,7 @@ #define _TCP_LRO_H_ #include +#include #ifndef TCP_LRO_ENTRIES /* Define default number of LRO entries per RX queue */ @@ -80,20 +81,12 @@ union lro_address { uint16_t d_port; /* destination TCP/UDP port */ uint32_t vxlan_vni; /* VXLAN virtual network identifier */ union { -#ifdef INET struct in_addr v4; -#endif -#ifdef INET6 struct in6_addr v6; -#endif } s_addr; /* source IPv4/IPv6 address */ union { -#ifdef INET struct in_addr v4; -#endif -#ifdef INET6 struct in6_addr v6; -#endif } d_addr; /* destination IPv4/IPv6 address */ }; } __aligned(sizeof(u_long));