From nobody Thu Sep 11 06:20:59 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 4cMnVz5L3hz67gjh; Thu, 11 Sep 2025 06:20:59 +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 4cMnVz4hpcz42yB; Thu, 11 Sep 2025 06:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757571659; 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=Qm4yZTy8x9St6MzDOsMRE8KF+6A1EPdeGSpQxSNxJy8=; b=XDpKLJytL4UaJhrq4CD5orEsBo7zxMYJAcjO4KYmepyOCyZ8PiCnYC5VQBTBQiR2m6gM5e KEVJ+ehzHWBPZhw0ECz3Aj+MF/GnPmN3RsSnkV3GCOncs26lggJHJZuo7wXQ7KFgSXlicO vfGP2n5b9WjbcpL6BsqKe9Ah4XfrtDUSJfi4bcECdEiCPPrQeKaGihyUPRJbL5MlH8fPiV iwQ8wsKPUgQjJfLqJqzsoB4L4zxhdWO8L7W9qSYv/KJEyiQPL3LYV6PhGrL0EPrE89xSuB PO9GVpLRZM4be5YYK1AaVMf5IuwMngpzfhvQSd+aQO49D981+K1iD4cKBhVwGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757571659; 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=Qm4yZTy8x9St6MzDOsMRE8KF+6A1EPdeGSpQxSNxJy8=; b=K8pDhkmXZNhxaQvcs9EtmUH8LpK/VN2UNE2uERKK3jfIxypRcYbmziOymJrYD5Zfg2UcSq 14WA4MX81QH3ui7lNnvUQWnw97A7pxghsmqlWtWACYOkuc2bYef2h/pZc7SarWpqAy119h VqdBq6sNsi5388NTxyokeAfeydlvt5uQHKSqfsvnWxsbqa6Jjw4dLxOa0EI78gRMvhdBza 6EDlY7DaT/xI8Jga26UrttrWUadH7/v55K0QGSrIuejzjkuBQD6gXBkqYoo3bHkTUxJ/15 MNJpKrQ2bgFILaLyNK6TlOw/5uWcaWplAhSVIDZWWtC4E4KdpdqvA6utWYJ62w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757571659; a=rsa-sha256; cv=none; b=syPaD6Qtd/Zn8DafEh6bGrO0GxzjcGeAtzg6JN6xQcW/CAzU3kSR97COVuKdNFYVPvd/XZ zlDlaTqZ6I8WhcyacMH2EedpbIe7v//XeJqSvP+pEQnJI36w2nG4t5ERYg5pl40AtF3afO ChKHgwZQrJPPQDasrTjPcrd5SxSibeX+eKoGDWwMqHv19MfOJuSgQdowcO5QYLd3H41Vny VQQ6HIR/TeSR5ptWtr0s+E1LTFDqZT6MijcGrjb2iE8pi6qvnSCzSBFX91R/tXSGtb7Ch9 qfXf6kNiIgPV5cWyWiNOFq8C2N3WGfn344bQA/RAOhIrnRvm6iYfEh+jTZg8CQ== 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 4cMnVz48sxzvwr; Thu, 11 Sep 2025 06:20:59 +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 58B6KxHP078859; Thu, 11 Sep 2025 06:20:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58B6KxrX078856; Thu, 11 Sep 2025 06:20:59 GMT (envelope-from git) Date: Thu, 11 Sep 2025 06:20:59 GMT Message-Id: <202509110620.58B6KxrX078856@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: c031033faa87 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: c031033faa8728668e48f576381a95d60d8739eb Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c031033faa8728668e48f576381a95d60d8739eb commit c031033faa8728668e48f576381a95d60d8739eb Author: Michael Tuexen AuthorDate: 2025-09-08 20:46:41 +0000 Commit: Michael Tuexen CommitDate: 2025-09-11 06:20:19 +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 73f27ac147ff..528ff3372097 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -133,12 +133,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); @@ -1761,6 +1763,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) @@ -1918,6 +1921,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) @@ -2040,10 +2044,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) {