Make igc(4) and ix(4) struct names unique.

In ddb show struct gets confused if the same struct name exists
twice.  Add a prefix to tx_ring and rx_ring in drivers.

OK miod@ jan@

1 files changed, 7 insertions, 7 deletions

diff --git a/sys/dev/pci/if_ix.h b/sys/dev/pci/if_ix.h
index ec2ac57e6fd..c1fc256d936 100644
--- a/sys/dev/pci/if_ix.h
+++ b/sys/dev/pci/if_ix.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ix.h,v 1.46 2023/08/04 10:58:27 jan Exp $	*/
+/*	$OpenBSD: if_ix.h,v 1.47 2024/05/21 11:19:39 bluhm Exp $	*/
 
 /******************************************************************************
 
@@ -158,14 +158,14 @@ struct ix_queue {
 	char			name[8];
 	pci_intr_handle_t	ih;
 	void			*tag;
-	struct tx_ring		*txr;
-	struct rx_ring		*rxr;
+	struct ix_txring	*txr;
+	struct ix_rxring	*rxr;
 };
 
 /*
  * The transmit ring, one per tx queue
  */
-struct tx_ring {
+struct ix_txring {
 	struct ix_softc		*sc;
 	struct ifqueue		*ifq;
 	uint32_t		me;
@@ -190,7 +190,7 @@ struct tx_ring {
 /*
  * The Receive ring, one per rx queue
  */
-struct rx_ring {
+struct ix_rxring {
 	struct ix_softc		*sc;
 	struct ifiqueue		*ifiq;
 	uint32_t		me;
@@ -262,14 +262,14 @@ struct ix_softc {
 	 * Transmit rings:
 	 *	Allocated at run time, an array of rings.
 	 */
-	struct tx_ring		*tx_rings;
+	struct ix_txring	*tx_rings;
 	int			num_tx_desc;
 
 	/*
 	 * Receive rings:
 	 *	Allocated at run time, an array of rings.
 	 */
-	struct rx_ring		*rx_rings;
+	struct ix_rxring	*rx_rings;
 	uint64_t		que_mask;
 	int			num_rx_desc;