From nobody Sat Sep 6 08:20:09 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 4cJmNp3n5Sz66F65; Sat, 06 Sep 2025 08:20:10 +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 4cJmNp1yY4z40C7; Sat, 06 Sep 2025 08:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757146810; 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=ELdKadXABoeeWWk3PWBe/8FfW0MJcZ4wm+lsIMSMhck=; b=M7Xp8e96oRc++C4k0I5OwL8GCK5iq+qik2sWr774m9y+b+Te8TAN3Aug34IUcBvN6OT+CG vEvTCF3PvhWTLe570rEKafnMrDHzqNIXZvHUh2wNnYDjv5Mm5UK77mxCbmw6flocFMgk69 iX2L/Y8xc83hZVEJ+nbHznI/ULY/I0gnKBhmaL889LOLESdSgIZxQ1fM+H0opvIgRYsQmj 0ldVes563q5K9UnIoQiYtxBsaB/yRPljM5JAziIPWLftqe5zDimtebG2VPynxlCKMBdBXV 5JnlrkC/e4QqG8u6TqSox0khifI0TR3BZ8kNikyNX5U4nvXv+FEStIk6dhpLbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757146810; 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=ELdKadXABoeeWWk3PWBe/8FfW0MJcZ4wm+lsIMSMhck=; b=hQNkwbZh+meU3rLPNDLVdYBBosKjPqwGxn+O6ni5LqvXlxS922wufsXvE9IGTErfgfjryr 5XAro2QIwNjHPo3qBgQ8I7bxKJ1Ib1+PprW21lEgVLeG1D5h/CIwfjUYKQ8MKhbROeShjA /zyd9kc/QHfoOcl8kxU4LVoA470hNZIAFiM2tAWQWIBQEG2RkXXTBbVK0bDxGpCmgUh9Gq Ks4Dnxg9q/l11PSXXgRu0cR1E7oOPtZmKi9tOuTgTUnI1gaa2i4hp02yMcUwz6neBguOml kU5gz/oj/gncb8slYp8mPkjfubzsZzAbg48Wsb+Bats/rjH3nkKX1MDk7ysJpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757146810; a=rsa-sha256; cv=none; b=EWoiqp5mP8eFOs7XzrdBhw0PJZRx14gs3TkjgiwraO2DKYo0CKjRwW9R49p5dczOVwH1CF qsOjjMZIKPXBlwoQuOc0oLrVUW8075/cCREhMIgasMri/2hhCw1RC+UUIO8E2qq7Lf+8EE ydcKI1jvYJFris7SCteZMRZN8Xw7bgrGokbZgGvboBnbiMzkcwCL9cum/pp/QdG3AusWj9 131PragsSKXb+M8zMqYdfo4JICvjQzStzDeQSY9dfZXQWt9gY7BEngDjcd6ZenMipaUkho WTQ3Fqe/IrrS8S5XvAPldqApNtpLfBxfi4VRrtMyJAwpFhp33150MNjhidJiwQ== 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 4cJmNp170PzBCn; Sat, 06 Sep 2025 08:20:10 +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 5868K9tM029467; Sat, 6 Sep 2025 08:20:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5868K9uo029459; Sat, 6 Sep 2025 08:20:09 GMT (envelope-from git) Date: Sat, 6 Sep 2025 08:20:09 GMT Message-Id: <202509060820.5868K9uo029459@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: 7c448f5aab8b - main - 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: 7c448f5aab8be6977d0860e608e7d497b495d28c Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7c448f5aab8be6977d0860e608e7d497b495d28c commit 7c448f5aab8be6977d0860e608e7d497b495d28c Author: Michael Tuexen AuthorDate: 2025-09-06 06:11:02 +0000 Commit: Michael Tuexen CommitDate: 2025-09-06 06:11:02 +0000 vtnet: fix compilation for NOIP configs Reported by: bz Fixes: 1c23d8f9f398 ("vtnet: improve checksum offloading") MFC after: 3 days Sponsored by: Netflix, Inc. --- 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) {