From nobody Wed Apr 17 13:43:47 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 4VKMZD2Xkwz5GwLR; Wed, 17 Apr 2024 13:43:48 +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 4VKMZD17MQz4lWZ; Wed, 17 Apr 2024 13:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713361428; 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=YAG55eUnI6rh5I62ymmP5UlS1T9bzKNBnmqi6/M681o=; b=p7bM/hzU0+x5IoCh8C5r+1M8Wph80WSwh4wSxJLuJ3zV2wq3MxPtVpkJ1+gF3ZgLjeLfp3 FO3GAdoo125sQCN7o5InXclFUB8YpfULASza8pkg47S0pvu6uX8aglX68O/YSvFUcRjBXv CkX/YrubM9SO4C/VASzrlVPBsNXoos6z98WPsdYREmpkM1z0d3kLNhIPVU5XCs6efcOQ8l 4g+GKIO6+hq17HTX+A1a54iNZgTKKr69yuoXUbQmTS17rXtZCcYaOIG9AWJ3varfHlmkna DV+wk+1Vnn2mXhocgtPXfXV/acpQJi5NIGzgMPCZr5tmMlQU7kTBqCssRs1rZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713361428; a=rsa-sha256; cv=none; b=bsyU5EhQsHRyDn2slhCc2k56tmjf/j+3tZql+SUiJyKZd6PJtZPE+gduFX2XhfuQeuQxxu EwxoOOxnMljyDXkaGNK6Lj5/j65yeDPiQ0FzKh1efrGGHyUSCrlGbuccSdMogj4whUcLoA Ky9o3JVUWY7duoT84B2V2vQswOKxztsfgFJZmVmX17LDGMmqjCFirHiwJSrXh6PdHkFiPr wpqhCEQhkoIcbi3tJ0B02YYwCGL4JdKYtXUKEtCDsQR3q2x/zpm0rMupCYVKr7EyLZInWu Ez7nVb2fxcReywh7jMZAZmIgNZYvaO1lW6PoVW2rQd3ZLefYb4fzOe2PLikIGw== 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=1713361428; 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=YAG55eUnI6rh5I62ymmP5UlS1T9bzKNBnmqi6/M681o=; b=r0Ok1Xmofhr9ni9HDVyBc4UIQmsszCqzu/b2W4aSJIupIuPnCCcXG/iIZGHRy7craN26GS dszH87a9uOb8MpIqfSEJZVxB0ZSg4OJ3Eb9Ou/b7k3IqZYOtE7R9yiVcbZ6EPR9RrJdhqZ NjTNmZgH7l+JXcpu7AJSJKQTAU3hzpnqhcSE3Mrsi9pJ2g24mzxLbfWqP6I9djR5XB3K50 5iRYsgZHBBhrXxXDf54cOsIAWdZafEkyK2IE9eD0WeAU48ekB7MMj39itZaAon8qA+SK9G 611UZ05nyhWpwPDsBwOfEvcrA1xqdYr6yjaVoR63NW4vEHmYesYQhiSSNT9rDA== 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 4VKMZD0k0czSTV; Wed, 17 Apr 2024 13:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43HDhlmS019253; Wed, 17 Apr 2024 13:43:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HDhlJ0019250; Wed, 17 Apr 2024 13:43:47 GMT (envelope-from git) Date: Wed, 17 Apr 2024 13:43:47 GMT Message-Id: <202404171343.43HDhlJ0019250@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: 307daa4f1759 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 307daa4f1759ba93e618d09c6a4a0a869ad5fc27 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=307daa4f1759ba93e618d09c6a4a0a869ad5fc27 commit 307daa4f1759ba93e618d09c6a4a0a869ad5fc27 Author: Michael Tuexen AuthorDate: 2024-02-06 21:47:16 +0000 Commit: Michael Tuexen CommitDate: 2024-04-17 13:43:08 +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 6b6a36317f63..45d6b54b18ed 100644 --- a/sys/dev/vnic/nicvf_queues.c +++ b/sys/dev/vnic/nicvf_queues.c @@ -1749,10 +1749,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;