From nobody Mon Sep 8 20:28:51 2025 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 4cLJSg4cJ3z674pL; Mon, 08 Sep 2025 20:28:51 +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 4cLJSg3sh5z42wl; Mon, 08 Sep 2025 20:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757363331; 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=iWw0W76ltKrW4PRHE8+fwKnxZ8RXNrSGoB1seoednQI=; b=n4dW5vZhKxhhZ1Dgy8USIwx5p3RW3m7yhd9VVpQ/gA80wtieIvOdcstdMiSlDjS5ZKEm9g VWP3Eb9DlcOI+b42ZiX3i4z74xZosWMuoxlzytteEL3dEyNoKyB9u4vaCsty1RFqYaCHZN eLW/vAbgAjYvoF8Yc4H7ySrz9YgLROPiKJzSG0COh+yhiMroAbV+UuKARZs/NoaXOSAqjV DO8VQsZ4IkI7GMeZRzVb6Jg+zv/FKovuptOSXUjwZOrDZpnn9BrJ+lU1ssO3tlsizTCq0o L3197bZX83ew6N3S1DUeMK01KMBboYoBxijpL5hoYuK3WalhpLWqNxtWNA1CEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757363331; 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=iWw0W76ltKrW4PRHE8+fwKnxZ8RXNrSGoB1seoednQI=; b=aPlNRVpwtsgknbxGMw0Mls8Flm7xm4DETI1rQip5dTgGpRf27x7wKRXgPkmZvzZnP4MHr7 4rHe+DFqKPgFFTzEXbEmR5GsCSepCQEw7+pY5Nk6LXNEoWVb/zQclFfFMdGZ/EqM+o+S/O 0xPezZbVC8eYbiwycgC0R5wkWptWcW9s56WqMFFHAgEdH160PBgxbdy6m4zxCvcWfR9jH5 2Nt+0mn+tly3TOJrXcLVxZsbZgoSbm8RNdU2fsv88RszdjuZZeKQ2ZatslTndXY63vHeyI jnAilSSqjrqBgN24JT95QD1pWoB5g/fQRwDQPJipXkfCd2wdP5mneJyHJ2cMSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757363331; a=rsa-sha256; cv=none; b=s3Zmd7zkYzmsuz8cEp/o+5desJk117/oCyzMBQ6ITWawn0oob1bFeM6HxI3ODqAQYRc5jg Do7gU4HsCY/o5/2ALb4Hig48h3qFvK0mUlMmWMxuWbIRek2h2tb4UrVn3aO3nTV4EruNvf OrroB4IrtescwJ2ol7yA1DiQSKWrzs9UUu8aaE5qeK/10huosWkRYbJbFEhwQwgM4lODuc qjx4izlwRc1k/Ljm/VGBODqmNGsa4hb2LyUxKo7tOzOqzR2iUBJGmqm986UkGgANLY0IrA wFRcEUejwxKbuibdn5dC5y2xpdUE6H+FIKu14URrk9qQg0L1U0c3MCi0YILy+w== 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 4cLJSg3MT8z1KhQ; Mon, 08 Sep 2025 20:28:51 +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 588KSpF7042642; Mon, 8 Sep 2025 20:28:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 588KSpw8042639; Mon, 8 Sep 2025 20:28:51 GMT (envelope-from git) Date: Mon, 8 Sep 2025 20:28:51 GMT Message-Id: <202509082028.588KSpw8042639@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: 0143c9eb764a - main - Revert "vtnet: fix compilation for NOIP configs" 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 0143c9eb764ad5ee1c2866439e923033daa30037 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0143c9eb764ad5ee1c2866439e923033daa30037 commit 0143c9eb764ad5ee1c2866439e923033daa30037 Author: Michael Tuexen AuthorDate: 2025-09-08 20:26:45 +0000 Commit: Michael Tuexen CommitDate: 2025-09-08 20:26:45 +0000 Revert "vtnet: fix compilation for NOIP configs" This reverts commit 7c448f5aab8be6977d0860e608e7d497b495d28c. Will be committed again with correct authorship. --- sys/dev/virtio/network/if_vtnet.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 528ff3372097..73f27ac147ff 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -133,14 +133,12 @@ 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); @@ -1763,7 +1761,6 @@ 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) @@ -1921,7 +1918,6 @@ 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) @@ -2044,15 +2040,10 @@ 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) {