From nobody Thu Aug 01 20:04:39 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 4WZg0l2cnMz5RMNN; Thu, 01 Aug 2024 20:04:39 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WZg0l1zhFz4G5K; Thu, 1 Aug 2024 20:04:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722542679; 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=L94Mi/ESuybUXyb7CbsBvfgnQlrSGqXQWRUJ8jqvHtg=; b=L6GbciaKI0avm1eSF4p6lUJa5mzm+hIk8ix8d9ecZ7XVWOkMhwLsks2j1PIFIWNpgDgYV9 hapT/bPMqCRn5HCoRgXsNC4ro2PtOfVALOuLW3Y7uvpfVsInW2HJ7r2V9YOJw6coGBa00W AIWwOv4m+XhT7nEhTa7CbD3H99wOrc9nn4IvhR3F+YKQESdT7WwIv0dBgtOIgW4wbiwHdh NluqBXfg8kTfIipiWSd+odkVL6ZQ33mX8FOhJZhxUA3ATCpPNhL/PE8wgcvsY2gIuLmJZ7 CYqX4prsEVlMrIflqQqJQUUG9S5EQp0+dW5uuNQwoDduO2A8kqsm9aRUUVdmgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722542679; a=rsa-sha256; cv=none; b=ydT9eNJZl161EStGzTX0JNUaEuY5yTiwHWe8eV3EdPp7R0OwYbS0K4y53oo+l3aDcTFYcQ PJ74cK712zSMSLlI+PqTXK4rx6a8XOXhHn6pB5lOCJxE7BReBGsZ0WIgPsB9aTgo5EMCvc YMXnPwRKjPYtzN/ronE/2kvjBZcE4WBh2L/qYkmS2QwD5Jo+Y3KtzTk6vuPgc67+evFjnL XF/y7LZ1Y6T+Th4BgOGUDgI9Lo797YMoo73EvKFAdBeeKvn6PTb58pk4VdBGgJ6H37mufj nWrZuDt2biQDAvstulHgmHmJWV8z/LqpWsAcmkLCMc1xgAu9lHztLN8wJF6Ekg== 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=1722542679; 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=L94Mi/ESuybUXyb7CbsBvfgnQlrSGqXQWRUJ8jqvHtg=; b=IHnWb284ZP/bXbBanx1EtQoOuFY+15U30Qobs8FVQ7DU/S5NxqQTK+D3/u70jPoB2N6QZy 1UWDF/k9Af49FaA6F7WYxx8wP9f4TzXhIackDcS09ohZQyuLfSaA+dv2r7Sv+NXJJCSiJQ zE4ZYjAtWPPVkfydUyzM92Fpryy40tIjiW4MVVnacqk74BbueLcSxLrTVwZoHG8voIHxCZ sP3Rv1JneIyl3I5b6LSbLiA+C6WVLmgnmTAlu8wTjCdkwWNG/Uc7gIVesPvNqN/uWLFKiw JKpD+0PcoPX5oELRJ08vZyYNhTHNbyTJ5k29Ig4vpao2PPeG/zla6n2iMV+h3Q== 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 4WZg0l1Dz5zykj; Thu, 1 Aug 2024 20:04:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 471K4dbf086334; Thu, 1 Aug 2024 20:04:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471K4dKx086331; Thu, 1 Aug 2024 20:04:39 GMT (envelope-from git) Date: Thu, 1 Aug 2024 20:04:39 GMT Message-Id: <202408012004.471K4dKx086331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 78de1d02e0ce - stable/13 - vnic: fix compilation of an IPv6 only kernel 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 78de1d02e0cebc2009e0dcb04b7b7309f326133a Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=78de1d02e0cebc2009e0dcb04b7b7309f326133a commit 78de1d02e0cebc2009e0dcb04b7b7309f326133a Author: Michael Tuexen AuthorDate: 2024-02-06 21:47:16 +0000 Commit: Michael Tuexen CommitDate: 2024-08-01 20:02:55 +0000 vnic: fix compilation of an IPv6 only kernel Sponsored by: Netflix, Inc. (cherry picked from commit 1d3d30c8d2e41052796c5bdd9220d7e3daabccad) --- sys/dev/vnic/nicvf_queues.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/vnic/nicvf_queues.c b/sys/dev/vnic/nicvf_queues.c index 4410bd4998dd..e1f434d0eb18 100644 --- a/sys/dev/vnic/nicvf_queues.c +++ b/sys/dev/vnic/nicvf_queues.c @@ -1744,10 +1744,15 @@ nicvf_sq_add_hdr_subdesc(struct snd_queue *sq, int qentry, struct ether_vlan_header *eh; #ifdef INET struct ip *ip; +#endif +#if defined(INET6) || defined(INET) struct tcphdr *th; #endif +#ifdef INET + int iphlen; +#endif + int ehdrlen, poff, proto; uint16_t etype; - int ehdrlen, iphlen, poff, proto; nic = sq->nic;