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

It was not discussed and should probably not happen.

Requested by:		msmith and others

3 files changed, 13 insertions, 13 deletions

diff --git a/sys/netncp/ncp_conn.c b/sys/netncp/ncp_conn.c
index b13688b..026f262 100644
--- a/sys/netncp/ncp_conn.c
+++ b/sys/netncp/ncp_conn.c
@@ -44,7 +44,7 @@
 #include <netncp/ncp_subr.h>
 #include <netncp/ncp_conn.h>
 
-SLIST_HEAD(ncp_handle_head, struct ncp_handle);
+SLIST_HEAD(ncp_handle_head,ncp_handle);
 
 int ncp_burst_enabled = 1;
 
@@ -248,7 +248,7 @@ ncp_conn_free(struct ncp_conn *ncp) {
 		ncp_conn_unlocklist(ncp->procp);
 		return 0;
 	}
-	SLIST_REMOVE(&conn_list, ncp, struct ncp_conn, nc_next);
+	SLIST_REMOVE(&conn_list, ncp, ncp_conn, nc_next);
 	ncp_conn_cnt--;
 	ncp_conn_unlocklist(ncp->procp);
 	if (ncp->li.user) free(ncp->li.user, M_NCPDATA);
@@ -434,7 +434,7 @@ ncp_conn_puthandle(struct ncp_handle *handle, struct proc *p, int force) {
 		refp->nh_ref = 0;
 	}
 	if (refp->nh_ref == 0) {
-		SLIST_REMOVE(&lhlist, refp, struct ncp_handle, nh_next);
+		SLIST_REMOVE(&lhlist, refp, ncp_handle, nh_next);
 		FREE(refp, M_NCPDATA);
 	}
 	lockmgr(&lhlock, LK_RELEASE, 0, p);
@@ -471,7 +471,7 @@ ncp_conn_putprochandles(struct proc *p) {
 		if (hp->nh_proc != p) continue;
 		haveone = 1;
 		hp->nh_conn->ref_cnt -= hp->nh_ref;
-		SLIST_REMOVE(&lhlist, hp, struct ncp_handle, nh_next);
+		SLIST_REMOVE(&lhlist, hp, ncp_handle, nh_next);
 		FREE(hp, M_NCPDATA);
 	}
 	lockmgr(&lhlock, LK_RELEASE, 0, p);
diff --git a/sys/netncp/ncp_conn.h b/sys/netncp/ncp_conn.h
index 2cbb97c..850e5e7 100644
--- a/sys/netncp/ncp_conn.h
+++ b/sys/netncp/ncp_conn.h
@@ -144,7 +144,7 @@ struct ncp_conn_stat {
 struct socket;
 struct u_cred;
 
-SLIST_HEAD(ncp_conn_head, struct ncp_conn);
+SLIST_HEAD(ncp_conn_head,ncp_conn);
 
 struct ncp_rq;
 struct ncp_conn;
@@ -154,7 +154,7 @@ struct ncp_conn;
  * This gives us a freedom in maintance of underlying connections.
  */
 struct ncp_handle {
-	SLIST_ENTRY(struct ncp_handle)	nh_next;
+	SLIST_ENTRY(ncp_handle)	nh_next;
 	int		nh_id;		/* handle id */
 	struct ncp_conn*nh_conn;	/* which conn we are refernce */
 	struct proc *	nh_proc;	/* who owns the handle	*/
@@ -165,7 +165,7 @@ struct ncp_handle {
  * Describes any connection to server 
  */
 struct ncp_conn {
-	SLIST_ENTRY(struct ncp_conn) nc_next;
+	SLIST_ENTRY(ncp_conn) nc_next;
 	struct ncp_conn_args li;
 	struct ucred 	*nc_owner;
 	gid_t		nc_group;
@@ -176,7 +176,7 @@ struct ncp_conn {
 	struct socket	*msg_so;
 	struct socket 	*bc_so;
 	int 		ref_cnt;		/* how many handles leased */
-	SLIST_HEAD(ncp_ref_hd, struct ncp_ref) ref_list;/* list of handles */
+	SLIST_HEAD(ncp_ref_hd,ncp_ref) ref_list;/* list of handles */
 	struct lock	nc_lock;		/* excl locks */
 	int		nc_lwant;		/* number of wanted locks */
 	struct proc	*procp;			/* pid currently operates */
diff --git a/sys/netncp/ncp_rcfile.h b/sys/netncp/ncp_rcfile.h
index dcebb3a..815b8dd 100644
--- a/sys/netncp/ncp_rcfile.h
+++ b/sys/netncp/ncp_rcfile.h
@@ -36,20 +36,20 @@
 #include <sys/queue.h>
 
 struct rckey {
-	SLIST_ENTRY(struct rckey)	rk_next;
+	SLIST_ENTRY(rckey)	rk_next;
 	char 			*rk_name;
 	char			*rk_value;
 };
 
 struct rcsection {
-	SLIST_ENTRY(struct rcsection)	rs_next;
-	SLIST_HEAD(rckey_head, struct rckey) rs_keys;
+	SLIST_ENTRY(rcsection)	rs_next;
+	SLIST_HEAD(rckey_head,rckey) rs_keys;
 	char			*rs_name;
 };
     
 struct rcfile {
-	SLIST_ENTRY(struct rcfile)	rf_next;
-	SLIST_HEAD(rcsec_head, struct rcsection) rf_sect;
+	SLIST_ENTRY(rcfile)	rf_next;
+	SLIST_HEAD(rcsec_head, rcsection) rf_sect;
 	char			*rf_name;
 	FILE			*rf_f;
 };