From nobody Tue Feb 06 21:49:39 2024 X-Original-To: dev-commits-src-main@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 4TTxjb65Klz5B2Rr; Tue, 6 Feb 2024 21:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TTxjb5YRWz4gNX; Tue, 6 Feb 2024 21:49:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707256179; 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=JO7Yx8pao8lcPNTArVoHqx4b4kfFWvVZBIaDBv/Gkzg=; b=pJ+RsFzAtFNARJQAEeYMTHqE//cdQO7NM0oJT8wM7gDHIH7WolQsXVMqVPiHFW8SVE10ly DqEGggNhlyiRKXThyuryxF105ja1Yq3W2atUrMG0t2Sl0IWuWC4mT/Oj+Qxgb/KJlI29vD U+fvLRPTtLiCOyfUpZm+Io0ZrLgIGWke0gflaSVOEoN0K2aGJsQ64BA5JXsFwbec+2vMHK xZUk1QXvEuYwsandziL1AgsdYIx0hsUSaEr61xZGDS8/TAyS+1m86LICFlyH+/UBRUJNEK 1o6QsEZSmP1WHjZyP6MaRg4nQqedPmfC3oX0PGGEsinyT889uYmNa+YtJMjf3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707256179; 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=JO7Yx8pao8lcPNTArVoHqx4b4kfFWvVZBIaDBv/Gkzg=; b=UC0ArI4KAIfz+q1AnxCInjj1xmNZINj4BUrArERiAES+84fZyFEh6+QOxXsW2IpwizjLW/ z/xDAPTgKbgl8VrxScktMmFbeLx4q1DdW7SSLFwL+sPUP9FYQznhbrbL1LT7AFJuRjSeMy IaHCZ8wzCNthoBQIde4M1YdXUsvo4ihhgtF/ED0OU/t8blsY4Ucq1AnV/ziLewDkgl+Fwp +0HlTNUdpFLSoBjh7TXBtx7WqddbQUyy8xVQVKMJgSIuoyMaULlDyddJ+biDEUFaZxhcTk /iBEYEPMVeYcZCtGSucB441MO3XWGhigB4K1DR3czsUjVVUZEPmNuzNydHg3jQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707256179; a=rsa-sha256; cv=none; b=g9tlNqkLO7KhrofKc+JsjnGApUHrRAwS7czLI5cot7UUDMepTZVARBy0RJdSnF9PN6FPMs gCc89iHNJSf24lWxtzEExvC2zkCjfQpylSiQYl+TX59jKyQsVxkwvpCsTltkf5qPVCjbCy 8mrJ1qZjRo6dU0RetqaPuKNQS50o1gKIMpAI2peUbSq8xH9Ftw2ymdHCeTmrO0sTJAuraL 1K8AJMwPhM8iUODeXB0jPz7FJ036BmHGo/ne0ZSrKcmoxRsJemaS6ubTLMVbTcvEmWlRbu 6wblvmavD4Rfq83L5WfYYnMDCPer2GDUA9txjk1DPYQzExmbDHIxq52MyW5fVg== 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 4TTxjb4d4vzgLn; Tue, 6 Feb 2024 21:49:39 +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 416Lnd5q004953; Tue, 6 Feb 2024 21:49:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 416LndaQ004950; Tue, 6 Feb 2024 21:49:39 GMT (envelope-from git) Date: Tue, 6 Feb 2024 21:49:39 GMT Message-Id: <202402062149.416LndaQ004950@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 1d3d30c8d2e4 - main - vnic: fix compilation of an IPv6 only kernel List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1d3d30c8d2e41052796c5bdd9220d7e3daabccad Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1d3d30c8d2e41052796c5bdd9220d7e3daabccad commit 1d3d30c8d2e41052796c5bdd9220d7e3daabccad Author: Michael Tuexen AuthorDate: 2024-02-06 21:47:16 +0000 Commit: Michael Tuexen CommitDate: 2024-02-06 21:47:16 +0000 vnic: fix compilation of an IPv6 only kernel MFC after: 1 week Sponsored by: Netflix, Inc. --- 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;