git: 0143c9eb764a - main - Revert "vtnet: fix compilation for NOIP configs"

The branch main has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=0143c9eb764ad5ee1c2866439e923033daa30037

commit 0143c9eb764ad5ee1c2866439e923033daa30037
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2025-09-08 20:26:45 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
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) {