Index: if_auereg.h
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/if_auereg.h,v
retrieving revision 1.28
diff -p -u -r1.28 if_auereg.h
--- if_auereg.h	5 Mar 2019 08:25:03 -0000	1.28
+++ if_auereg.h	21 Jul 2019 10:25:20 -0000
@@ -220,9 +220,7 @@ struct aue_cdata {
 	struct aue_chain	aue_rx_chain[AUE_RX_LIST_CNT];
 	struct aue_intrpkt	aue_ibuf;
 	int			aue_tx_prod;
-	int			aue_tx_cons;
 	int			aue_tx_cnt;
-	int			aue_rx_prod;
 };
 
 struct aue_softc {
Index: if_axe.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/if_axe.c,v
retrieving revision 1.101
diff -p -u -r1.101 if_axe.c
--- if_axe.c	21 Jul 2019 09:38:28 -0000	1.101
+++ if_axe.c	21 Jul 2019 10:25:20 -0000
@@ -144,9 +144,7 @@ struct axe_cdata {
 	struct axe_chain	axe_tx_chain[AXE_TX_LIST_CNT];
 	struct axe_chain	axe_rx_chain[AXE_RX_LIST_CNT];
 	int			axe_tx_prod;
-	int			axe_tx_cons;
 	int			axe_tx_cnt;
-	int			axe_rx_prod;
 };
 
 struct axe_softc {
Index: if_cdce.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/if_cdce.c,v
retrieving revision 1.52
diff -p -u -r1.52 if_cdce.c
--- if_cdce.c	29 Jun 2019 07:46:19 -0000	1.52
+++ if_cdce.c	21 Jul 2019 10:25:20 -0000
@@ -100,9 +100,7 @@ struct cdce_cdata {
 	struct cdce_chain	 cdce_rx_chain[CDCE_RX_LIST_CNT];
 	struct cdce_chain	 cdce_tx_chain[CDCE_TX_LIST_CNT];
 	int			 cdce_tx_prod;
-	int			 cdce_tx_cons;
 	int			 cdce_tx_cnt;
-	int			 cdce_rx_prod;
 };
 
 struct cdce_softc {
Index: if_cuereg.h
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/if_cuereg.h,v
retrieving revision 1.21
diff -p -u -r1.21 if_cuereg.h
--- if_cuereg.h	5 Mar 2019 08:25:03 -0000	1.21
+++ if_cuereg.h	21 Jul 2019 10:25:20 -0000
@@ -159,9 +159,7 @@ struct cue_cdata {
 	struct cue_chain	cue_tx_chain[CUE_TX_LIST_CNT];
 	struct cue_chain	cue_rx_chain[CUE_RX_LIST_CNT];
 	int			cue_tx_prod;
-	int			cue_tx_cons;
 	int			cue_tx_cnt;
-	int			cue_rx_prod;
 };
 
 struct cue_softc {
Index: if_kuereg.h
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/if_kuereg.h,v
retrieving revision 1.21
diff -p -u -r1.21 if_kuereg.h
--- if_kuereg.h	5 Mar 2019 08:25:03 -0000	1.21
+++ if_kuereg.h	21 Jul 2019 10:25:20 -0000
@@ -154,9 +154,7 @@ struct kue_cdata {
 	struct kue_chain	kue_tx_chain[KUE_TX_LIST_CNT];
 	struct kue_chain	kue_rx_chain[KUE_RX_LIST_CNT];
 	int			kue_tx_prod;
-	int			kue_tx_cons;
 	int			kue_tx_cnt;
-	int			kue_rx_prod;
 };
 
 struct kue_softc {
Index: if_udavreg.h
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/if_udavreg.h,v
retrieving revision 1.12
diff -p -u -r1.12 if_udavreg.h
--- if_udavreg.h	5 Mar 2019 08:25:03 -0000	1.12
+++ if_udavreg.h	21 Jul 2019 10:25:20 -0000
@@ -160,9 +160,7 @@ struct udav_cdata {
 	struct udav_intrpkg	udav_ibuf;
 #endif
 	int			udav_tx_prod;
-	int			udav_tx_cons;
 	int			udav_tx_cnt;
-	int			udav_rx_prod;
 };
 
 struct udav_softc {
Index: if_upl.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/if_upl.c,v
retrieving revision 1.63
diff -p -u -r1.63 if_upl.c
--- if_upl.c	5 May 2019 03:17:54 -0000	1.63
+++ if_upl.c	21 Jul 2019 10:25:20 -0000
@@ -117,16 +117,13 @@ struct upl_chain {
 	struct usbd_xfer	*upl_xfer;
 	char			*upl_buf;
 	struct mbuf		*upl_mbuf;
-	int			upl_idx;
 };
 
 struct upl_cdata {
 	struct upl_chain	upl_tx_chain[UPL_TX_LIST_CNT];
 	struct upl_chain	upl_rx_chain[UPL_RX_LIST_CNT];
 	int			upl_tx_prod;
-	int			upl_tx_cons;
 	int			upl_tx_cnt;
-	int			upl_rx_prod;
 };
 
 struct upl_softc {
@@ -437,7 +434,6 @@ upl_rx_list_init(struct upl_softc *sc)
 	for (i = 0; i < UPL_RX_LIST_CNT; i++) {
 		c = &cd->upl_rx_chain[i];
 		c->upl_sc = sc;
-		c->upl_idx = i;
 		if (upl_newbuf(sc, c, NULL) == ENOBUFS)
 			return ENOBUFS;
 		if (c->upl_xfer == NULL) {
@@ -465,7 +461,6 @@ upl_tx_list_init(struct upl_softc *sc)
 	for (i = 0; i < UPL_TX_LIST_CNT; i++) {
 		c = &cd->upl_tx_chain[i];
 		c->upl_sc = sc;
-		c->upl_idx = i;
 		c->upl_mbuf = NULL;
 		if (c->upl_xfer == NULL) {
 			int error = usbd_create_xfer(sc->sc_ep[UPL_ENDPT_TX],
Index: if_url.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/if_url.c,v
retrieving revision 1.65
diff -p -u -r1.65 if_url.c
--- if_url.c	28 May 2019 07:41:50 -0000	1.65
+++ if_url.c	21 Jul 2019 10:25:20 -0000
@@ -822,7 +822,6 @@ url_rx_list_init(struct url_softc *sc)
 	for (i = 0; i < URL_RX_LIST_CNT; i++) {
 		c = &cd->url_rx_chain[i];
 		c->url_sc = sc;
-		c->url_idx = i;
 		if (url_newbuf(sc, c, NULL) == ENOBUFS)
 			return ENOBUFS;
 		if (c->url_xfer == NULL) {
@@ -850,7 +849,6 @@ url_tx_list_init(struct url_softc *sc)
 	for (i = 0; i < URL_TX_LIST_CNT; i++) {
 		c = &cd->url_tx_chain[i];
 		c->url_sc = sc;
-		c->url_idx = i;
 		c->url_mbuf = NULL;
 		if (c->url_xfer == NULL) {
 			int error = usbd_create_xfer(sc->sc_pipe_tx, URL_BUFSZ,
Index: if_urlreg.h
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/if_urlreg.h,v
retrieving revision 1.12
diff -p -u -r1.12 if_urlreg.h
--- if_urlreg.h	5 Mar 2019 08:25:03 -0000	1.12
+++ if_urlreg.h	21 Jul 2019 10:25:20 -0000
@@ -135,7 +135,6 @@ struct url_chain {
 	struct usbd_xfer	*url_xfer;
 	char			*url_buf;
 	struct mbuf		*url_mbuf;
-	int			url_idx;
 };
 
 struct url_cdata {
@@ -146,9 +145,7 @@ struct url_cdata {
 	struct url_intrpkg	url_ibuf;
 #endif
 	int			url_tx_prod;
-	int			url_tx_cons;
 	int			url_tx_cnt;
-	int			url_rx_prod;
 };
 
 struct url_softc {