From nobody Mon Sep 8 20:50: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 4cLJyC5h6jz675pK; Mon, 08 Sep 2025 20:50: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 4cLJyC53Jxz45lB; Mon, 08 Sep 2025 20:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757364659; 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=3un+smscs+deb5v00VGqbgH8LP5vYlIH6/9e0nwmtbA=; b=MA0pco+neiL0yuC+X9QlnD4R1hACgFiCAWEkbcZMo7cnRbXSjGHGQuKsbNmDDwsIMhJ5eQ nZJbDC3kxERYeEwoN7i/nonMEawnbp7scYcXyQhweSwxvi9i8rZeQYveAMsc6UGT2IJgYs TjlxrY8wbgdto2F43slOMzZ9aXiJv4vOFnx81nc+eXXK1HL+Tm70tcrpO0sL0PBwYHNeMN taqwUw1xVB6t2Ueoq5FbSNuXXE21aU1j95mttaWH/irxnFEf2us9S4WVlHSjo8wDrYd9Uk HtVwspUjNXXfkhLCPx+wZEIglGc3NjU8ZMI/B63Y0oUGqI8pYqWY1uvwzdAjjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757364659; 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=3un+smscs+deb5v00VGqbgH8LP5vYlIH6/9e0nwmtbA=; b=wC+Vfcw/FBB+p93uc5UTdf0XAr22nDOgNvlGhZi/p2HqYJLzVEZtMhzdhSKm90or11/jVc sDAih3kdWk0IH1ge/uu0iVplhKlwsEYyCt0LS4dsgazGQ8v7ehFhEz8egXVJHvqKi0gCzu sZRnTywHpKzh+0PqVJQ2aUDKWGh16jCvO6MDOp76v5easjU5OcryiROaslSqIDVYL7LOFb 2VtkbaascB4v334DdIN7d+jpc3C9S7Rl7tdzBBPZoFRGm1bRtoEtgEMaI+CgdC2OqlRzlR CJcqd6yi8GKvFq6yD73wUm2l0cnNFlllN2UIkdHHI69WL/nEWXSCSq9C3xKojw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757364659; a=rsa-sha256; cv=none; b=H1X6VY1NrL8Ik8sFU1o5vNNicM32rcDzyxxIvjSEnP1V47YbayPgTGiDiBzjSvjCTKQKed ReUABenoBkzHA9mpJZihxd7RRPTwjHVBVjyTw3ekwI4fhoLAJMvVsPDQXsoOrmHNrdVYVm v1W2vBIxHqeHfahZnMFL+BS2vndbOFdZhFGztDjARQNV3VLakRRb18RRir7Oc/SBNVOGc6 tyGzYPdyzTlrN5kS+8eY44sWlNwBYs4xiovAr4YAlCmIXz8VL6TKTHyS86Wi6Tb2VvHnjd BOUFNl59C1DVVwOY+gtgdAymoU8YhWtz777NEpkEN22PVOakXJ9XjDs2pwhI2g== 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 4cLJyC4QRbz1LLC; Mon, 08 Sep 2025 20:50: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 588KoxAK091345; Mon, 8 Sep 2025 20:50:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 588Kox0U091342; Mon, 8 Sep 2025 20:50:59 GMT (envelope-from git) Date: Mon, 8 Sep 2025 20:50:59 GMT Message-Id: <202509082050.588Kox0U091342@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: 614e9b33bf55 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 614e9b33bf5594d9d09b5d296afa4f3aa6971823 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=614e9b33bf5594d9d09b5d296afa4f3aa6971823 commit 614e9b33bf5594d9d09b5d296afa4f3aa6971823 Author: Michael Tuexen AuthorDate: 2025-09-08 20:46:41 +0000 Commit: Michael Tuexen CommitDate: 2025-09-08 20:46:41 +0000 vtnet: fix compilation for NOIP configs Reported by: bz Fixes: 3008f30d2c2c ("vtnet: improve checksum offloading") MFC after: 3 days --- 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) {