Change the way that the queue(3) structures are declared; don't assume that

the type argument to *_HEAD and *_ENTRY is a struct.

Suggested by:	phk
Reviewed by:	phk
Approved by:	mdodd

8 files changed, 19 insertions, 19 deletions

diff --git a/sys/netinet6/in6_prefix.h b/sys/netinet6/in6_prefix.h
index fa5a0e3..daae4ed 100644
--- a/sys/netinet6/in6_prefix.h
+++ b/sys/netinet6/in6_prefix.h
@@ -31,8 +31,8 @@
 
 struct rr_prefix {
 	struct	ifprefix	rp_ifpr;
-	LIST_ENTRY(rr_prefix) rp_entry;
-	LIST_HEAD(rp_addrhead, rp_addr) rp_addrhead;
+	LIST_ENTRY(struct rr_prefix) rp_entry;
+	LIST_HEAD(rp_addrhead, struct rp_addr) rp_addrhead;
 	struct	sockaddr_in6 rp_prefix;	/* prefix */
 	u_int32_t	rp_vltime;	/* advertised valid lifetime */
 	u_int32_t	rp_pltime;	/* advertised preferred lifetime */
@@ -63,7 +63,7 @@ struct rr_prefix {
 #define	rp_rrf_decrprefd	rp_flags.prf_rr.decrprefd
 
 struct rp_addr {
-	LIST_ENTRY(rp_addr) ra_entry;
+	LIST_ENTRY(struct rp_addr) ra_entry;
 	struct	in6_addr	ra_ifid;
 	struct	in6_ifaddr	*ra_addr;
 	struct	ra_flags {
@@ -79,7 +79,7 @@ struct rp_addr {
 #define	RR_INFINITE_LIFETIME		0xffffffff
 
 
-LIST_HEAD(rr_prhead, rr_prefix);
+LIST_HEAD(rr_prhead, struct rr_prefix);
 
 extern struct	rr_prhead rr_prefix;
 
diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
index 163c167..d8aeb57 100644
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -453,11 +453,11 @@ do {									\
  */
 struct in6_multi_mship {
 	struct	in6_multi *i6mm_maddr;	/* Multicast address pointer */
-	LIST_ENTRY(in6_multi_mship)	i6mm_chain;  /* multicast options chain */
+	LIST_ENTRY(struct in6_multi_mship) i6mm_chain;  /* multicast options chain */
 };
 
 struct	in6_multi {
-	LIST_ENTRY(in6_multi)	in6m_entry; /* list glue */
+	LIST_ENTRY(struct in6_multi)	in6m_entry; /* list glue */
 	struct	in6_addr in6m_addr;	/* IP6 multicast address */
 	struct	ifnet *in6m_ifp;	/* back pointer to ifnet */
 	struct	ifmultiaddr *in6m_ifma;	/* back pointer to ifmultiaddr */
@@ -472,7 +472,7 @@ struct	in6_multi {
 SYSCTL_DECL(_net_inet6_ip6);
 #endif
 
-extern LIST_HEAD(in6_multihead, in6_multi) in6_multihead;
+extern LIST_HEAD(in6_multihead, struct in6_multi) in6_multihead;
 
 /*
  * Structure used by macros below to remember position when stepping through
diff --git a/sys/netinet6/ip6_fw.c b/sys/netinet6/ip6_fw.c
index d6b4ca2..40cf312 100644
--- a/sys/netinet6/ip6_fw.c
+++ b/sys/netinet6/ip6_fw.c
@@ -66,7 +66,7 @@ static int fw6_verbose_limit = IPV6FIREWALL_VERBOSE_LIMIT;
 static int fw6_verbose_limit = 0;
 #endif
 
-LIST_HEAD (ip6_fw_head, ip6_fw_chain) ip6_fw_chain;
+LIST_HEAD (ip6_fw_head, struct ip6_fw_chain) ip6_fw_chain;
 
 #ifdef SYSCTL_NODE
 SYSCTL_DECL(_net_inet6_ip6);
diff --git a/sys/netinet6/ip6_fw.h b/sys/netinet6/ip6_fw.h
index a356ac3..3b492eb 100644
--- a/sys/netinet6/ip6_fw.h
+++ b/sys/netinet6/ip6_fw.h
@@ -97,7 +97,7 @@ struct ip6_fw {
 #define	fw_reject_code	fw_un.fu_reject_code
 
 struct	ip6_fw_chain {
-	LIST_ENTRY(ip6_fw_chain) chain;
+	LIST_ENTRY(struct ip6_fw_chain) chain;
 	struct	ip6_fw    *rule;
 };
 
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index 2e70bcb..0a33997 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -109,7 +109,7 @@ struct	ip6_moptions {
 	struct	ifnet *im6o_multicast_ifp; /* ifp for outgoing multicasts */
 	u_char	im6o_multicast_hlim;	/* hoplimit for outgoing multicasts */
 	u_char	im6o_multicast_loop;	/* 1 >= hear sends if a member */
-	LIST_HEAD(, in6_multi_mship) im6o_memberships;
+	LIST_HEAD(, struct in6_multi_mship) im6o_memberships;
 };
 
 /*
diff --git a/sys/netinet6/ipsec.h b/sys/netinet6/ipsec.h
index df68bd7..ee20268 100644
--- a/sys/netinet6/ipsec.h
+++ b/sys/netinet6/ipsec.h
@@ -59,7 +59,7 @@ struct secpolicyindex {
 
 /* Security Policy Data Base */
 struct secpolicy {
-	LIST_ENTRY(secpolicy) chain;
+	LIST_ENTRY(struct secpolicy) chain;
 
 	int	refcnt;			/* reference count */
 	struct secpolicyindex spidx;	/* selector */
diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h
index 756f495..3040dc9 100644
--- a/sys/netinet6/nd6.h
+++ b/sys/netinet6/nd6.h
@@ -125,7 +125,7 @@ struct	in6_ndireq {
 		((MAX_RANDOM_FACTOR - MIN_RANDOM_FACTOR) * (x >> 10)))) /1000)
 
 struct	nd_defrouter {
-	LIST_ENTRY(nd_defrouter)	dr_entry;
+	LIST_ENTRY(struct nd_defrouter)	dr_entry;
 	struct	in6_addr rtaddr;
 	u_char	flags;
 	u_short	rtlifetime;
@@ -135,7 +135,7 @@ struct	nd_defrouter {
 
 struct nd_prefix {
 	struct	ifnet *ndpr_ifp;
-	LIST_ENTRY(nd_prefix) ndpr_entry;
+	LIST_ENTRY(struct nd_prefix) ndpr_entry;
 	struct	sockaddr_in6 ndpr_prefix;	/* prefix */
 	struct	in6_addr ndpr_mask; /* netmask derived from the prefix */
 	struct	in6_addr ndpr_addr; /* address that is derived from the prefix */
@@ -145,7 +145,7 @@ struct nd_prefix {
 	time_t	ndpr_preferred;	/* preferred time of the prefix */
 	struct	prf_ra ndpr_flags;
 	/* list of routers that advertise the prefix: */
-	LIST_HEAD(pr_rtrhead, nd_pfxrouter) ndpr_advrtrs;
+	LIST_HEAD(pr_rtrhead, struct nd_pfxrouter) ndpr_advrtrs;
 	u_char	ndpr_plen;
 	struct	ndpr_stateflags {
 		/* if this prefix can be regarded as on-link */
@@ -196,12 +196,12 @@ struct inet6_ndpr_msghdr {
 #define	ndpr2ifpr(ndpr)	((struct ifprefix *)(ndpr))
 
 struct nd_pfxrouter {
-	LIST_ENTRY(nd_pfxrouter) pfr_entry;
+	LIST_ENTRY(struct nd_pfxrouter) pfr_entry;
 	struct	nd_defrouter *router;
 };
 
-LIST_HEAD(nd_drhead, nd_defrouter);
-LIST_HEAD(nd_prhead, nd_prefix);
+LIST_HEAD(nd_drhead, struct nd_defrouter);
+LIST_HEAD(nd_prhead, struct nd_prefix);
 
 /* nd6.c */
 extern int	nd6_prune;
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index 9c16e1e..3ba9535 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -796,9 +796,9 @@ nd6_ifptomac(ifp)
 	}
 }
 
-TAILQ_HEAD(dadq_head, dadq);
+TAILQ_HEAD(dadq_head, struct dadq);
 struct dadq {
-	TAILQ_ENTRY(dadq) dad_list;
+	TAILQ_ENTRY(struct dadq) dad_list;
 	struct ifaddr *dad_ifa;
 	int dad_count;		/* max NS to send */
 	int dad_ns_ocount;	/* NS sent so far */