Back out the previous change to the queue(3) interface.

It was not discussed and should probably not happen.

Requested by:		msmith and others

4 files changed, 13 insertions, 13 deletions

diff --git a/sys/pci/amd.h b/sys/pci/amd.h
index e36956e..85f4f80 100644
--- a/sys/pci/amd.h
+++ b/sys/pci/amd.h
@@ -154,7 +154,7 @@ typedef struct _EEprom {
  * SCSI Request Block
  */
 struct amd_srb {
-	TAILQ_ENTRY(struct amd_srb) links;
+	TAILQ_ENTRY(amd_srb) links;
 	u_int8_t	 CmdBlock[12];
 	union		 ccb *pccb;
 	bus_dmamap_t	 dmamap;
@@ -187,7 +187,7 @@ struct amd_srb {
 	u_int8_t	 ScsiCmdLen;
 };
 
-TAILQ_HEAD(srb_queue, struct amd_srb);
+TAILQ_HEAD(srb_queue, amd_srb);
 
 /*
  * Per-adapter, software configuration.
diff --git a/sys/pci/if_skreg.h b/sys/pci/if_skreg.h
index 2a5afc0..af17c1c 100644
--- a/sys/pci/if_skreg.h
+++ b/sys/pci/if_skreg.h
@@ -1129,7 +1129,7 @@ struct sk_jslot {
 
 struct sk_jpool_entry {
 	int                             slot;
-	SLIST_ENTRY(struct sk_jpool_entry)	jpool_entries;
+	SLIST_ENTRY(sk_jpool_entry)	jpool_entries;
 };
 
 struct sk_chain {
@@ -1209,8 +1209,8 @@ struct sk_if_softc {
 	struct sk_softc		*sk_softc;	/* parent controller */
 	int			sk_tx_bmu;	/* TX BMU register */
 	int			sk_if_flags;
-	SLIST_HEAD(__sk_jfreehead, struct sk_jpool_entry) sk_jfree_listhead;
-	SLIST_HEAD(__sk_jinusehead, struct sk_jpool_entry) sk_jinuse_listhead;
+	SLIST_HEAD(__sk_jfreehead, sk_jpool_entry)	sk_jfree_listhead;
+	SLIST_HEAD(__sk_jinusehead, sk_jpool_entry)	sk_jinuse_listhead;
 };
 
 #define SK_MAXUNIT	256
diff --git a/sys/pci/if_tireg.h b/sys/pci/if_tireg.h
index fd6cb00..5210ffa 100644
--- a/sys/pci/if_tireg.h
+++ b/sys/pci/if_tireg.h
@@ -1103,12 +1103,12 @@ struct ti_type {
 
 struct ti_mc_entry {
 	struct ether_addr		mc_addr;
-	SLIST_ENTRY(struct ti_mc_entry)	mc_entries;
+	SLIST_ENTRY(ti_mc_entry)	mc_entries;
 };
 
 struct ti_jpool_entry {
 	int                             slot;
-	SLIST_ENTRY(struct ti_jpool_entry)	jpool_entries;
+	SLIST_ENTRY(ti_jpool_entry)	jpool_entries;
 };
 
 struct ti_softc {
@@ -1135,9 +1135,9 @@ struct ti_softc {
 	u_int16_t		ti_std;		/* current std ring head */
 	u_int16_t		ti_mini;	/* current mini ring head */
 	u_int16_t		ti_jumbo;	/* current jumo ring head */
-	SLIST_HEAD(__ti_mchead, struct ti_mc_entry)	ti_mc_listhead;
-	SLIST_HEAD(__ti_jfreehead, struct ti_jpool_entry) ti_jfree_listhead;
-	SLIST_HEAD(__ti_jinusehead, struct ti_jpool_entry) ti_jinuse_listhead;
+	SLIST_HEAD(__ti_mchead, ti_mc_entry)	ti_mc_listhead;
+	SLIST_HEAD(__ti_jfreehead, ti_jpool_entry)	ti_jfree_listhead;
+	SLIST_HEAD(__ti_jinusehead, ti_jpool_entry)	ti_jinuse_listhead;
 	u_int32_t		ti_stat_ticks;
 	u_int32_t		ti_rx_coal_ticks;
 	u_int32_t		ti_tx_coal_ticks;
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index 081cd54..aa58b8a 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -87,13 +87,13 @@ struct pci_quirk pci_quirks[] = {
 #define PCI_MAPPORT	0x04	/* port map */
 
 struct pci_devinfo {
-    	STAILQ_ENTRY(struct pci_devinfo) pci_links;
+    	STAILQ_ENTRY(pci_devinfo) pci_links;
 	struct resource_list resources;
 	pcicfgregs		cfg;
 	struct pci_conf		conf;
 };
 
-static STAILQ_HEAD(devlist, struct pci_devinfo) pci_devq;
+static STAILQ_HEAD(devlist, pci_devinfo) pci_devq;
 u_int32_t pci_numdevs = 0;
 static u_int32_t pci_generation = 0;
 
@@ -400,7 +400,7 @@ pci_freecfg(struct pci_devinfo *dinfo)
 	if (dinfo->cfg.map != NULL)
 		free(dinfo->cfg.map, M_DEVBUF);
 	/* XXX this hasn't been tested */
-	STAILQ_REMOVE(devlist_head, dinfo, struct pci_devinfo, pci_links);
+	STAILQ_REMOVE(devlist_head, dinfo, pci_devinfo, pci_links);
 	free(dinfo, M_DEVBUF);
 
 	/* increment the generation count */