From nobody Thu Sep 11 06:38:14 2025 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 4cMntv1v8Tz67hWT; Thu, 11 Sep 2025 06:38:15 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cMntv17hNz4661; Thu, 11 Sep 2025 06:38:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757572695; 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=wbfvmCXWv9pxRIlX2avfnNKBjgqRYxMkXdDsNbQVQ3k=; b=VMTDZHc7URX7dCrtzyFdtsgSgbOmIHILMla1blfb7+/bVPCBEkQNZZnEcQc5o00moJ5HwR 2ymLrwYu6zcRMRk0e+2c4KS7PhLBuM5e1pUfBlsJrXKzPMACvyD0jDrMyHvnpsn3UYKCHs y/8RJx8aCvZXh5j/MHM9oRvfhnpSyY1/79Sg3YX+ys+dJoPXsPREP5orVuAqPw4w8E/08o CbH2N7FOrW+3HONBS+5Bv3UMShgLQs1/If9Ic2ZA1IJxq/CFQAULxdwB30t44bqXgxBg+D 2vun+qHZH6O29WwEnabOpKML3/WaG/SxgLsAFHuShPhMBsJO/Qwftg9EbHbqZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757572695; 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=wbfvmCXWv9pxRIlX2avfnNKBjgqRYxMkXdDsNbQVQ3k=; b=DdTpS1igHGRaCAMV58V9gu1z/Zgu4vtbyMC2F/yIBEqHEu0QOxdwBjbHGTDOJUYWUEwdc2 O29tiI7E7MVgsseDaLSYftr6lgjMXbF0E62vk5KJ9+xsn7ZCyMYuUt9M92cqSumzkZN6/j UDITMalvMNZIrzUXXsU6I3/7FC2ooQPyCmCaDkD63b1jvUIZJezZw+4nudBWWU+A8ccRTF F/rOAZ0xsaieVhsirHC9taopCbgU672MWCBnY7uEdDReFamAFE0OSSRQiFbUO1usuz5718 sseXJJp/YBojbFE3HftQ0Oq0TCZSCuI1phXjKIRpXxfb6e4ktLczueRfTOjh9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757572695; a=rsa-sha256; cv=none; b=AkqKyk14jRI1QkWDZWbni7JCMnkd5m+DmiIpJIltlr06mX9EWVY9tHXCiGLpcD74BQU1pT GvcQ44iJG+GQVGaABaEfGGPvBiLe/JhBv6xoy2RFO1IAK+XoJLmalGzgJJ2emAMrW7m6o8 MR7rH6l2YxkzsoJ2UtpNXWiou/i3suUumjRV4iVrElQOUZs8sKDHie4bk70FmkDtq0LQmn m2MHv+0nMfWQXqRH96ik588//IhHqkbC0oN8sDEUBY9dDd89UVA0VdAsqSNEEomPELlYc5 KL1bINi+s8MwlntC494M7kLL1bRRUOVRDmGdNO0Zmy+zztcge4K5QEXYFo1ouw== 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 4cMntv0Tn9zwXh; Thu, 11 Sep 2025 06:38:15 +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 58B6cErq008521; Thu, 11 Sep 2025 06:38:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58B6cErF008518; Thu, 11 Sep 2025 06:38:14 GMT (envelope-from git) Date: Thu, 11 Sep 2025 06:38:14 GMT Message-Id: <202509110638.58B6cErF008518@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: d140a121523e - stable/14 - vtnet: fix compilation for NOIP configs 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: d140a121523e4a13cb8c04c317e85bf20284e24e Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d140a121523e4a13cb8c04c317e85bf20284e24e commit d140a121523e4a13cb8c04c317e85bf20284e24e Author: Michael Tuexen AuthorDate: 2025-09-08 20:46:41 +0000 Commit: Michael Tuexen CommitDate: 2025-09-11 06:36:51 +0000 vtnet: fix compilation for NOIP configs Reported by: bz Fixes: 3008f30d2c2c ("vtnet: improve checksum offloading") (cherry picked from commit 614e9b33bf5594d9d09b5d296afa4f3aa6971823) --- sys/dev/virtio/network/if_vtnet.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 774635df5aed..92cb659c92c3 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -134,12 +134,14 @@ static int vtnet_rxq_replace_lro_nomrg_buf(struct vtnet_rxq *, static int vtnet_rxq_replace_buf(struct vtnet_rxq *, struct mbuf *, int); static int vtnet_rxq_enqueue_buf(struct vtnet_rxq *, struct mbuf *); static int vtnet_rxq_new_buf(struct vtnet_rxq *); +#if defined(INET) || defined(INET6) static int vtnet_rxq_csum_needs_csum(struct vtnet_rxq *, struct mbuf *, bool, int, struct virtio_net_hdr *); static void vtnet_rxq_csum_data_valid(struct vtnet_rxq *, struct mbuf *, int); static int vtnet_rxq_csum(struct vtnet_rxq *, struct mbuf *, struct virtio_net_hdr *); +#endif static void vtnet_rxq_discard_merged_bufs(struct vtnet_rxq *, int); static void vtnet_rxq_discard_buf(struct vtnet_rxq *, struct mbuf *); static int vtnet_rxq_merged_eof(struct vtnet_rxq *, struct mbuf *, int); @@ -1758,6 +1760,7 @@ vtnet_rxq_new_buf(struct vtnet_rxq *rxq) return (error); } +#if defined(INET) || defined(INET6) static int vtnet_rxq_csum_needs_csum(struct vtnet_rxq *rxq, struct mbuf *m, bool isipv6, int protocol, struct virtio_net_hdr *hdr) @@ -1915,6 +1918,7 @@ vtnet_rxq_csum(struct vtnet_rxq *rxq, struct mbuf *m, return (0); } +#endif static void vtnet_rxq_discard_merged_bufs(struct vtnet_rxq *rxq, int nbufs) @@ -2037,10 +2041,15 @@ vtnet_rxq_input(struct vtnet_rxq *rxq, struct mbuf *m, if (hdr->flags & (VIRTIO_NET_HDR_F_NEEDS_CSUM | VIRTIO_NET_HDR_F_DATA_VALID)) { +#if defined(INET) || defined(INET6) if (vtnet_rxq_csum(rxq, m, hdr) == 0) rxq->vtnrx_stats.vrxs_csum++; else rxq->vtnrx_stats.vrxs_csum_failed++; +#else + sc->vtnet_stats.rx_csum_bad_ethtype++; + rxq->vtnrx_stats.vrxs_csum_failed++; +#endif } if (hdr->gso_size != 0) {