Module Name: src
Committed By: msaitoh
Date: Fri Dec 29 07:36:47 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe.h
Log Message:
ixgbe: Use #ifdef LRO more to reduce the size of struct rx_ring.
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/pci/ixgbe/ixgbe.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.114 src/sys/dev/pci/ixgbe/ix_txrx.c:1.115
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.114 Thu Dec 28 10:13:51 2023
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Fri Dec 29 07:36:47 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.114 2023/12/28 10:13:51 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.115 2023/12/29 07:36:47 msaitoh Exp $ */
/******************************************************************************
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.114 2023/12/28 10:13:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.115 2023/12/29 07:36:47 msaitoh Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1577,7 +1577,9 @@ ixgbe_setup_receive_ring(struct rx_ring
/* Setup our descriptor indices */
rxr->next_to_check = 0;
rxr->next_to_refresh = sc->num_rx_desc - 1; /* Fully allocated */
+#ifdef LRO
rxr->lro_enabled = FALSE;
+#endif
rxr->discard_multidesc = false;
IXGBE_EVC_STORE(&rxr->rx_copies, 0);
#if 0 /* NetBSD */
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.95 src/sys/dev/pci/ixgbe/ixgbe.h:1.96
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.95 Fri Dec 29 07:34:20 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.h Fri Dec 29 07:36:47 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.95 2023/12/29 07:34:20 msaitoh Exp $ */
+/* $NetBSD: ixgbe.h,v 1.96 2023/12/29 07:36:47 msaitoh Exp $ */
/******************************************************************************
SPDX-License-Identifier: BSD-3-Clause
@@ -413,8 +413,8 @@ struct rx_ring {
struct ixgbe_dma_alloc rxdma;
#ifdef LRO
struct lro_ctrl lro;
-#endif /* LRO */
bool lro_enabled;
+#endif /* LRO */
bool hw_rsc;
bool vtag_strip;
bool discard_multidesc;
