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

It was not discussed and should probably not happen.

Requested by:		msmith and others

6 files changed, 18 insertions, 18 deletions

diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index 81476f6..0868b7c 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -61,12 +61,12 @@ struct bounce_page {
 	bus_addr_t	busaddr;	/* Physical address */
 	vm_offset_t	datavaddr;	/* kva of client data */
 	bus_size_t	datacount;	/* client data count */
-	STAILQ_ENTRY(struct bounce_page) links;
+	STAILQ_ENTRY(bounce_page) links;
 };
 
 int busdma_swi_pending;
 
-static STAILQ_HEAD(bp_list, struct bounce_page) bounce_page_list;
+static STAILQ_HEAD(bp_list, bounce_page) bounce_page_list;
 static int free_bpages;
 static int reserved_bpages;
 static int active_bpages;
@@ -82,11 +82,11 @@ struct bus_dmamap {
 	bus_size_t	       buflen;		/* unmapped buffer length */
 	bus_dmamap_callback_t *callback;
 	void		      *callback_arg;
-	STAILQ_ENTRY(struct bus_dmamap) links;
+	STAILQ_ENTRY(bus_dmamap) links;
 };
 
-static STAILQ_HEAD(, struct bus_dmamap) bounce_map_waitinglist;
-static STAILQ_HEAD(, struct bus_dmamap) bounce_map_callbacklist;
+static STAILQ_HEAD(, bus_dmamap) bounce_map_waitinglist;
+static STAILQ_HEAD(, bus_dmamap) bounce_map_callbacklist;
 static struct bus_dmamap nobounce_dmamap;
 
 static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages);
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 054db2b..813f2ae 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -191,13 +191,13 @@ struct	pv_entry;
 
 struct md_page {
 	int pv_list_count;
-	TAILQ_HEAD(,struct pv_entry)	pv_list;
+	TAILQ_HEAD(,pv_entry)	pv_list;
 };
 
 struct pmap {
 	pd_entry_t		*pm_pdir;	/* KVA of page directory */
 	vm_object_t		pm_pteobj;	/* Container for pte's */
-	TAILQ_HEAD(,struct pv_entry)	pm_pvlist;/* list of mappings in pmap */
+	TAILQ_HEAD(,pv_entry)	pm_pvlist;	/* list of mappings in pmap */
 	int			pm_count;	/* reference count */
 	int			pm_active;	/* active on cpus */
 	struct pmap_statistics	pm_stats;	/* pmap statistics */
@@ -219,8 +219,8 @@ extern pmap_t		kernel_pmap;
 typedef struct pv_entry {
 	pmap_t		pv_pmap;	/* pmap where mapping lies */
 	vm_offset_t	pv_va;		/* virtual address for mapping */
-	TAILQ_ENTRY(struct pv_entry)	pv_list;
-	TAILQ_ENTRY(struct pv_entry)	pv_plist;
+	TAILQ_ENTRY(pv_entry)	pv_list;
+	TAILQ_ENTRY(pv_entry)	pv_plist;
 	vm_page_t	pv_ptem;	/* VM page for pte */
 } *pv_entry_t;
 
diff --git a/sys/i386/isa/bs/bsvar.h b/sys/i386/isa/bs/bsvar.h
index 1914eb1..6267c31 100644
--- a/sys/i386/isa/bs/bsvar.h
+++ b/sys/i386/isa/bs/bsvar.h
@@ -261,7 +261,7 @@ struct sc_p {
 #define	BSCFLAGSMASK	(0xffff)
 
 struct bsccb {
-	TAILQ_ENTRY(struct bsccb) ccb_chain;
+	TAILQ_ENTRY(bsccb) ccb_chain;
 
 	union ccb *ccb;			/* upper drivers info */
 
@@ -296,9 +296,9 @@ GENERIC_CCB_ASSERT(bs, bsccb)
 
 /* target info */
 struct targ_info {
-/*0*/	TAILQ_ENTRY(struct targ_info) ti_tchain;	/* targ_info link */
+/*0*/	TAILQ_ENTRY(targ_info) ti_tchain;	/* targ_info link */
 
-/*4*/	TAILQ_ENTRY(struct targ_info) ti_wchain;	/* wait link */
+/*4*/	TAILQ_ENTRY(targ_info) ti_wchain;	/* wait link */
 
 /*8*/	struct bs_softc *ti_bsc;		/* our controller */
 /*c*/	u_int ti_id;				/* scsi id */
@@ -364,7 +364,7 @@ struct targ_info {
 	struct scsi_sense_data sense;
 };
 
-TAILQ_HEAD(titab, struct targ_info);
+TAILQ_HEAD(titab, targ_info);
 struct bshw;
 
 struct bs_softc {
diff --git a/sys/i386/isa/ccbque.h b/sys/i386/isa/ccbque.h
index 088252a..cb6bebe 100644
--- a/sys/i386/isa/ccbque.h
+++ b/sys/i386/isa/ccbque.h
@@ -41,7 +41,7 @@
 						
 /* (I)  structure and prototype */
 #define GENERIC_CCB_ASSERT(DEV, CCBTYPE)				\
-TAILQ_HEAD(CCBTYPE##tab, struct CCBTYPE);				\
+TAILQ_HEAD(CCBTYPE##tab, CCBTYPE);					\
 struct CCBTYPE##que {							\
 	struct CCBTYPE##tab CCBTYPE##tab;				\
 	int count;							\
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index 0da59b5..b4c5daa 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -33,7 +33,7 @@
 #include <i386/isa/isa_device.h>
 #endif /* _KERNEL */
 
-typedef TAILQ_HEAD(, struct datapoint) dphead_t;
+typedef TAILQ_HEAD(, datapoint) dphead_t;
 
 struct datapoint {
 	/* Fields used by kernel */
@@ -48,7 +48,7 @@ struct datapoint {
 	u_int			qsig;
 	u_int			ssig;
 	u_int64_t		epoch;
-	TAILQ_ENTRY(struct datapoint)	list;
+	TAILQ_ENTRY(datapoint)	list;
 	int			vco;
 	int			bounce;
 	pid_t			pid;
diff --git a/sys/i386/linux/linux_ioctl.c b/sys/i386/linux/linux_ioctl.c
index 609baae..582770f 100644
--- a/sys/i386/linux/linux_ioctl.c
+++ b/sys/i386/linux/linux_ioctl.c
@@ -85,12 +85,12 @@ DATA_SET(linux_ioctl_handler_set, termio_handler);
 
 struct handler_element 
 {
-	TAILQ_ENTRY(struct handler_element) list;
+	TAILQ_ENTRY(handler_element) list;
 	int	(*func)(struct proc *, struct linux_ioctl_args *);
 	int	low, high, span;
 };
 
-static TAILQ_HEAD(, struct handler_element) handlers =
+static TAILQ_HEAD(, handler_element) handlers =
 	TAILQ_HEAD_INITIALIZER(handlers);
 
 static int