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

It was not discussed and should probably not happen.

Requested by:		msmith and others

7 files changed, 20 insertions, 20 deletions

diff --git a/sys/net/hostcache.h b/sys/net/hostcache.h
index c0b0f12..3158db9 100644
--- a/sys/net/hostcache.h
+++ b/sys/net/hostcache.h
@@ -49,7 +49,7 @@
 #include <sys/queue.h>
 
 struct hcentry {
-	LIST_ENTRY(struct hcentry) hc_link;
+	LIST_ENTRY(hcentry) hc_link;
 	struct	timeval hc_idlesince;	/* time last ref dropped */
 	struct	sockaddr *hc_host;	/* address of this entry's host */
 	struct	rtentry *hc_rt;		/* route to get there */
@@ -64,7 +64,7 @@ struct hccallback {
 	u_long	(*hccb_bump)(u_long);
 };
 
-LIST_HEAD(hchead, struct hcentry);
+LIST_HEAD(hchead, hcentry);
 
 struct hctable {
 	u_long	hct_nentries;
diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c
index 344271a..97d93c8 100644
--- a/sys/net/if_ef.c
+++ b/sys/net/if_ef.c
@@ -82,12 +82,12 @@ struct efnet {
 };
 
 struct ef_link {
-	SLIST_ENTRY(struct ef_link) el_next;
+	SLIST_ENTRY(ef_link) el_next;
 	struct ifnet	*el_ifp;		/* raw device for this clones */
 	struct efnet	*el_units[EF_NFT];	/* our clones */
 };
 
-static SLIST_HEAD(ef_link_head, struct ef_link) efdev = {NULL};
+static SLIST_HEAD(ef_link_head, ef_link) efdev = {NULL};
 static int efcount;
 
 extern int (*ef_inputp)(struct ifnet*, struct ether_header *eh, struct mbuf *m);
diff --git a/sys/net/if_media.h b/sys/net/if_media.h
index ea7bfb7..2ed5ed0 100644
--- a/sys/net/if_media.h
+++ b/sys/net/if_media.h
@@ -64,7 +64,7 @@ typedef	void (*ifm_stat_cb_t) __P((struct ifnet *ifp, struct ifmediareq *req));
  * In-kernel representation of a single supported media type.
  */
 struct ifmedia_entry {
-	LIST_ENTRY(struct ifmedia_entry) ifm_list;
+	LIST_ENTRY(ifmedia_entry) ifm_list;
 	int	ifm_media;	/* description of this media attachment */
 	int	ifm_data;	/* for driver-specific use */
 	void	*ifm_aux;	/* for driver-specific use */
@@ -78,7 +78,7 @@ struct ifmedia {
 	int	ifm_mask;	/* mask of changes we don't care about */
 	int	ifm_media;	/* current user-set media word */
 	struct ifmedia_entry *ifm_cur;	/* currently selected media */
-	LIST_HEAD(, struct ifmedia_entry) ifm_list; /* list of all supported media */
+	LIST_HEAD(, ifmedia_entry) ifm_list; /* list of all supported media */
 	ifm_change_cb_t	ifm_change;	/* media change driver callback */
 	ifm_stat_cb_t	ifm_status;	/* media status driver callback */
 };
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index a7060cd..2ec532b 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -75,10 +75,10 @@ struct	ether_header;
 
 #include <sys/queue.h>		/* get TAILQ macros */
 
-TAILQ_HEAD(ifnethead, struct ifnet);	/* we use TAILQs so that the order of */
-TAILQ_HEAD(ifaddrhead, struct ifaddr);	/* instantiation is preserved in the list */
-TAILQ_HEAD(ifprefixhead, struct ifprefix);
-LIST_HEAD(ifmultihead, struct ifmultiaddr);
+TAILQ_HEAD(ifnethead, ifnet);	/* we use TAILQs so that the order of */
+TAILQ_HEAD(ifaddrhead, ifaddr);	/* instantiation is preserved in the list */
+TAILQ_HEAD(ifprefixhead, ifprefix);
+LIST_HEAD(ifmultihead, ifmultiaddr);
 
 /*
  * Structure defining a queue for a network interface.
@@ -99,7 +99,7 @@ struct	ifqueue {
 struct ifnet {
 	void	*if_softc;		/* pointer to driver state */
 	char	*if_name;		/* name, e.g. ``en'' or ``lo'' */
-	TAILQ_ENTRY(struct ifnet) if_link; /* all struct ifnets are chained */
+	TAILQ_ENTRY(ifnet) if_link; 	/* all struct ifnets are chained */
 	struct	ifaddrhead if_addrhead;	/* linked list of addresses per if */
         int	if_pcount;		/* number of promiscuous listeners */
 	struct	bpf_if *if_bpf;		/* packet filter structure */
@@ -260,7 +260,7 @@ struct ifaddr {
 #define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
 	struct	sockaddr *ifa_netmask;	/* used to determine subnet */
 	struct	ifnet *ifa_ifp;		/* back-pointer to interface */
-	TAILQ_ENTRY(struct ifaddr) ifa_link;	/* queue macro glue */
+	TAILQ_ENTRY(ifaddr) ifa_link;	/* queue macro glue */
 	void	(*ifa_rtrequest)	/* check or clean routes (+ or -)'d */
 		__P((int, struct rtentry *, struct sockaddr *));
 	u_short	ifa_flags;		/* mostly rt_flags for cloning */
@@ -287,7 +287,7 @@ struct ifaddr {
 struct ifprefix {
 	struct	sockaddr *ifpr_prefix;	/* prefix of interface */
 	struct	ifnet *ifpr_ifp;	/* back-pointer to interface */
-	TAILQ_ENTRY(struct ifprefix) ifpr_list; /* queue macro glue */
+	TAILQ_ENTRY(ifprefix) ifpr_list; /* queue macro glue */
 	u_char	ifpr_plen;		/* prefix length in bits */
 	u_char	ifpr_type;		/* protocol dependent prefix type */
 };
@@ -299,7 +299,7 @@ struct ifprefix {
  * address, not a count of pointers to this structure.
  */
 struct ifmultiaddr {
-	LIST_ENTRY(struct ifmultiaddr) ifma_link; /* queue macro glue */
+	LIST_ENTRY(ifmultiaddr) ifma_link; /* queue macro glue */
 	struct	sockaddr *ifma_addr; 	/* address this membership is for */
 	struct	sockaddr *ifma_lladdr;	/* link-layer translation, if any */
 	struct	ifnet *ifma_ifp;	/* back-pointer to interface */
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
index 2cbcc21..8fbe10c 100644
--- a/sys/net/if_vlan_var.h
+++ b/sys/net/if_vlan_var.h
@@ -35,7 +35,7 @@
 #ifdef _KERNEL
 struct vlan_mc_entry {
 	struct ether_addr		mc_addr;
-	SLIST_ENTRY(struct vlan_mc_entry)	mc_entries;
+	SLIST_ENTRY(vlan_mc_entry)	mc_entries;
 };
 
 struct	ifvlan {
@@ -46,7 +46,7 @@ struct	ifvlan {
 		u_int16_t ifvm_proto; /* encapsulation ethertype */
 		u_int16_t ifvm_tag; /* tag to apply on packets leaving if */
 	}	ifv_mib;
-	SLIST_HEAD(__vlan_mchead, struct vlan_mc_entry)	vlan_mc_listhead;
+	SLIST_HEAD(__vlan_mchead, vlan_mc_entry)	vlan_mc_listhead;
 };
 #define	ifv_if	ifv_ac.ac_if
 #define	ifv_tag	ifv_mib.ifvm_tag
diff --git a/sys/net/pfil.h b/sys/net/pfil.h
index bed0b27..7831328 100644
--- a/sys/net/pfil.h
+++ b/sys/net/pfil.h
@@ -41,7 +41,7 @@ struct ifnet;
  * possibly intercept the packet.
  */
 struct packet_filter_hook {
-        TAILQ_ENTRY(struct packet_filter_hook) pfil_link;
+        TAILQ_ENTRY(packet_filter_hook) pfil_link;
         int	(*pfil_func) __P((void *, int, struct ifnet *, int,
 				  struct mbuf **));
 	int	pfil_flags;
@@ -52,7 +52,7 @@ struct packet_filter_hook {
 #define PFIL_WAITOK	0x00000004
 #define PFIL_ALL	(PFIL_IN|PFIL_OUT)
 
-typedef	TAILQ_HEAD(pfil_list, struct packet_filter_hook) pfil_list_t;
+typedef	TAILQ_HEAD(pfil_list, packet_filter_hook) pfil_list_t;
 
 struct pfil_head {
 	pfil_list_t	ph_in;
diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h
index cdf695b..6c079a9 100644
--- a/sys/net/raw_cb.h
+++ b/sys/net/raw_cb.h
@@ -44,7 +44,7 @@
  * to tie a socket to the generic raw interface.
  */
 struct rawcb {
-	LIST_ENTRY(struct rawcb) list;
+	LIST_ENTRY(rawcb) list;
 	struct	socket *rcb_socket;	/* back pointer to socket */
 	struct	sockaddr *rcb_faddr;	/* destination address */
 	struct	sockaddr *rcb_laddr;	/* socket's address */
@@ -60,7 +60,7 @@ struct rawcb {
 #define	RAWRCVQ		8192
 
 #ifdef _KERNEL
-extern LIST_HEAD(rawcb_list_head, struct rawcb) rawcb_list;
+extern LIST_HEAD(rawcb_list_head, rawcb) rawcb_list;
 
 int	 raw_attach __P((struct socket *, int));
 void	 raw_ctlinput __P((int, struct sockaddr *, void *));