From c21a3bec7e22565b370164879b3a845a62cf29be Mon Sep 17 00:00:00 2001
From: Lauri Tirkkonen <lotheac@iki.fi>
Date: Fri, 3 Feb 2017 15:19:44 +0200
Subject: [PATCH] socket.h: remove omsghdr

---
 include/sys/ib/clients/rdsv3/rdsv3.h               |  2 +-
 include/sys/ib/clients/rdsv3/rdsv3_impl.h          |  2 +-
 include/sys/ksocket.h                              |  8 ++---
 include/sys/socket.h                               | 27 ----------------
 include/sys/socket_proto.h                         | 12 ++++----
 include/sys/socketvar.h                            |  4 +--
 include/sys/sockfilter.h                           |  4 +--
 kernel/comstar/port/iscsit/iscsit_radiuspacket.c   |  2 +-
 kernel/fs/sockfs/sock_notsupp.c                    |  4 +--
 kernel/fs/sockfs/sockcommon.c                      |  6 ++--
 kernel/fs/sockfs/sockcommon.h                      | 18 +++++------
 kernel/fs/sockfs/sockcommon_sops.c                 |  8 ++---
 kernel/fs/sockfs/sockcommon_subr.c                 |  2 +-
 kernel/fs/sockfs/sockcommon_vnops.c                |  4 +--
 kernel/fs/sockfs/sockfilter.c                      |  4 +--
 kernel/fs/sockfs/sockfilter_impl.h                 |  2 +-
 kernel/fs/sockfs/socksyscalls.c                    | 36 +++++++++++-----------
 kernel/fs/sockfs/socktpi.c                         | 12 ++++----
 kernel/net/ip/icmp.c                               |  4 +--
 kernel/net/ip/rts.c                                |  2 +-
 kernel/net/sockmods/sockmod_pfp.c                  |  4 +--
 kernel/net/sockmods/socksctp.c                     | 12 ++++----
 kernel/net/sockmods/socksctp.h                     |  2 +-
 kernel/net/sockmods/socksctpsubr.c                 |  2 +-
 kernel/net/sockmods/socksdp.c                      |  8 ++---
 kernel/net/tcp/tcp_socket.c                        |  4 +--
 kernel/net/udp/udp.c                               |  4 +--
 kernel/os/sysent.c                                 |  4 +--
 kernel/syscall/sendfile.c                          |  4 +--
 share/man/man7p/ip.7p                              |  9 ------
 share/man/man7p/ip6.7p                             |  9 ------
 share/man/man7p/udp.7p                             |  9 ------
 usr/src/boot/sys/sys/socket.h                      | 11 -------
 usr/src/lib/libfakekernel/common/ksocket.c         |  4 +--
 usr/src/lib/libresolv2/common/bsd/writev.c         |  2 --
 usr/src/uts/common/fs/smbsrv/smb_opipe.c           |  4 +--
 usr/src/uts/common/io/ib/clients/rdsv3/af_rds.c    |  4 +--
 usr/src/uts/common/io/ib/clients/rdsv3/rds_recv.c  |  2 +-
 .../uts/common/io/ib/clients/rdsv3/rdsv3_impl.c    |  2 +-
 usr/src/uts/common/io/ib/clients/rdsv3/send.c      |  2 +-
 usr/src/uts/common/io/ksocket/ksocket.c            | 14 ++++-----
 .../common/io/scsi/adapters/iscsi/radius_packet.c  |  4 +--
 usr/src/uts/common/io/trill.c                      |  2 +-
 43 files changed, 109 insertions(+), 176 deletions(-)

diff --git a/include/sys/ib/clients/rdsv3/rdsv3.h b/include/sys/ib/clients/rdsv3/rdsv3.h
index e39d4347da..22d4485ca0 100644
--- a/include/sys/ib/clients/rdsv3/rdsv3.h
+++ b/include/sys/ib/clients/rdsv3/rdsv3.h
@@ -611,7 +611,7 @@ int rdsv3_page_remainder_alloc(struct rdsv3_scatterlist *scat,
     unsigned long bytes, int gfp);
 
 /* send.c */
-int rdsv3_sendmsg(struct rdsv3_sock *rs, uio_t *uio, struct nmsghdr *msg,
+int rdsv3_sendmsg(struct rdsv3_sock *rs, uio_t *uio, struct msghdr *msg,
     size_t payload_len);
 void rdsv3_send_reset(struct rdsv3_connection *conn);
 int rdsv3_send_xmit(struct rdsv3_connection *conn);
diff --git a/include/sys/ib/clients/rdsv3/rdsv3_impl.h b/include/sys/ib/clients/rdsv3/rdsv3_impl.h
index 56b92f8037..fab8731d66 100644
--- a/include/sys/ib/clients/rdsv3/rdsv3_impl.h
+++ b/include/sys/ib/clients/rdsv3/rdsv3_impl.h
@@ -364,7 +364,7 @@ void rdsv3_conn_destructor(void *buf, void *arg);
 int rdsv3_conn_compare(const void *conn1, const void *conn2);
 void rdsv3_loop_init();
 int rdsv3_mr_compare(const void *mr1, const void *mr2);
-int rdsv3_put_cmsg(struct nmsghdr *msg, int level, int type, size_t size,
+int rdsv3_put_cmsg(struct msghdr *msg, int level, int type, size_t size,
     void *payload);
 int rdsv3_verify_bind_address(ipaddr_t addr);
 uint16_t rdsv3_ip_fast_csum(void *buffer, size_t length);
diff --git a/include/sys/ksocket.h b/include/sys/ksocket.h
index a6dbc3efc6..7d3d38ed0a 100644
--- a/include/sys/ksocket.h
+++ b/include/sys/ksocket.h
@@ -33,7 +33,7 @@ extern "C" {
 
 /* Opaque kernel socket type */
 typedef struct __ksocket *ksocket_t;
-struct nmsghdr;
+struct msghdr;
 
 /* flag bit for each Callback Event */
 #define	KSOCKET_CB_CONNECTED		0x00000001
@@ -95,15 +95,15 @@ extern int 	ksocket_send(ksocket_t, void *, size_t, int, size_t *,
 		    struct cred *);
 extern int	ksocket_sendto(ksocket_t, void *, size_t, int,
 		    struct sockaddr *, socklen_t, size_t *, struct cred *);
-extern int 	ksocket_sendmsg(ksocket_t, struct nmsghdr *, int, size_t *,
+extern int 	ksocket_sendmsg(ksocket_t, struct msghdr *, int, size_t *,
 		    struct cred *);
-extern int	ksocket_sendmblk(ksocket_t, struct nmsghdr *, int, mblk_t **,
+extern int	ksocket_sendmblk(ksocket_t, struct msghdr *, int, mblk_t **,
 		    struct cred *);
 extern int 	ksocket_recv(ksocket_t, void *, size_t, int, size_t *,
 		    struct cred *);
 extern int	ksocket_recvfrom(ksocket_t, void *, size_t, int,
 		    struct sockaddr *, socklen_t *, size_t *, struct cred *);
-extern int	ksocket_recvmsg(ksocket_t, struct nmsghdr *, int, size_t *,
+extern int	ksocket_recvmsg(ksocket_t, struct msghdr *, int, size_t *,
 		    struct cred *);
 extern int	ksocket_shutdown(ksocket_t, int, struct cred *);
 extern int 	ksocket_setsockopt(ksocket_t, int, int, const void *, int,
diff --git a/include/sys/socket.h b/include/sys/socket.h
index 321d5d4c49..8e059d53c4 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -315,33 +315,8 @@ struct msghdr {
 
 #if	defined(_KERNEL) || defined(_FAKE_KERNEL)
 
-/*
- *	N.B.:  we assume that omsghdr and nmsghdr are isomorphic, with
- *	the sole exception that nmsghdr has the additional msg_flags
- *	field at the end.
- */
-struct omsghdr {
-	void		*msg_name;	/* optional address */
-	socklen_t	msg_namelen;	/* size of address */
-	struct	iovec	*msg_iov;	/* scatter/gather array */
-	int		msg_iovlen;	/* # elements in msg_iov */
-	caddr_t		msg_accrights;	/* access rights sent/received */
-	int		msg_accrightslen;
-};
-
-#define	nmsghdr		msghdr
-
 #if defined(_SYSCALL32)
 
-struct omsghdr32 {
-	caddr32_t	msg_name;	/* optional address */
-	uint32_t	msg_namelen;	/* size of address */
-	caddr32_t	msg_iov;	/* scatter/gather array */
-	int32_t		msg_iovlen;	/* # elements in msg_iov */
-	caddr32_t	msg_accrights;	/* access rights sent/received */
-	uint32_t	msg_accrightslen;
-};
-
 struct msghdr32 {
 	caddr32_t	msg_name;	/* optional address */
 	uint32_t	msg_namelen;	/* size of address */
@@ -352,8 +327,6 @@ struct msghdr32 {
 	int32_t		msg_flags;	/* flags on received message */
 };
 
-#define	nmsghdr32	msghdr32
-
 #endif	/* _SYSCALL32 */
 #endif	/* _KERNEL */
 
diff --git a/include/sys/socket_proto.h b/include/sys/socket_proto.h
index 2773cf233c..07295ba886 100644
--- a/include/sys/socket_proto.h
+++ b/include/sys/socket_proto.h
@@ -112,11 +112,11 @@ struct sock_downcalls_s {
 		    socklen_t *, cred_t *);
 	int	(*sd_setsockopt)(sock_lower_handle_t, int, int, const void *,
 		    socklen_t, cred_t *);
-	int	(*sd_send)(sock_lower_handle_t, mblk_t *, struct nmsghdr *,
+	int	(*sd_send)(sock_lower_handle_t, mblk_t *, struct msghdr *,
 		    cred_t *);
-	int	(*sd_send_uio)(sock_lower_handle_t, uio_t *, struct nmsghdr *,
+	int	(*sd_send_uio)(sock_lower_handle_t, uio_t *, struct msghdr *,
 		    cred_t *);
-	int	(*sd_recv_uio)(sock_lower_handle_t, uio_t *, struct nmsghdr *,
+	int	(*sd_recv_uio)(sock_lower_handle_t, uio_t *, struct msghdr *,
 		    cred_t *);
 	short	(*sd_poll)(sock_lower_handle_t, short, int, cred_t *);
 	int	(*sd_shutdown)(sock_lower_handle_t, int, cred_t *);
@@ -159,11 +159,11 @@ extern int sock_getsockopt_notsupp(sock_lower_handle_t, int, int, void *,
 extern int sock_setsockopt_notsupp(sock_lower_handle_t, int, int,
     const void *, socklen_t, cred_t *);
 extern int sock_send_notsupp(sock_lower_handle_t, mblk_t *,
-    struct nmsghdr *, cred_t *);
+    struct msghdr *, cred_t *);
 extern int sock_send_uio_notsupp(sock_lower_handle_t, uio_t *,
-    struct nmsghdr *, cred_t *);
+    struct msghdr *, cred_t *);
 extern int sock_recv_uio_notsupp(sock_lower_handle_t, uio_t *,
-    struct nmsghdr *, cred_t *);
+    struct msghdr *, cred_t *);
 extern short sock_poll_notsupp(sock_lower_handle_t, short, int, cred_t *);
 extern int sock_shutdown_notsupp(sock_lower_handle_t, int, cred_t *);
 extern void sock_clr_flowctrl_notsupp(sock_lower_handle_t);
diff --git a/include/sys/socketvar.h b/include/sys/socketvar.h
index b24bf07e3f..cf113e10d0 100644
--- a/include/sys/socketvar.h
+++ b/include/sys/socketvar.h
@@ -921,8 +921,8 @@ extern int	sobind(struct sonode *, struct sockaddr *, socklen_t,
 extern int	solisten(struct sonode *, int);
 extern int	soconnect(struct sonode *, struct sockaddr *, socklen_t,
 		    int, int);
-extern int	sorecvmsg(struct sonode *, struct nmsghdr *, struct uio *);
-extern int	sosendmsg(struct sonode *, struct nmsghdr *, struct uio *);
+extern int	sorecvmsg(struct sonode *, struct msghdr *, struct uio *);
+extern int	sosendmsg(struct sonode *, struct msghdr *, struct uio *);
 extern int	soshutdown(struct sonode *, int);
 extern int	sogetsockopt(struct sonode *, int, int, void *, socklen_t *,
 		    int);
diff --git a/include/sys/sockfilter.h b/include/sys/sockfilter.h
index c3a7816700..f5a41b3f04 100644
--- a/include/sys/sockfilter.h
+++ b/include/sys/sockfilter.h
@@ -81,7 +81,7 @@ typedef mblk_t 		*(*sof_data_in_fn_t)(sof_handle_t, void *, mblk_t *,
 typedef mblk_t		*(*sof_data_in_proc_fn_t)(sof_handle_t, void *,
     mblk_t *, cred_t *, size_t *);
 typedef mblk_t		*(*sof_data_out_fn_t)(sof_handle_t, void *, mblk_t *,
-    struct nmsghdr *, cred_t *, sof_rval_t *);
+    struct msghdr *, cred_t *, sof_rval_t *);
 typedef sof_rval_t	(*sof_bind_fn_t)(sof_handle_t, void *,
     struct sockaddr *, socklen_t *, cred_t *);
 typedef sof_rval_t	(*sof_listen_fn_t)(sof_handle_t, void *, int *,
@@ -136,7 +136,7 @@ extern void	sof_newconn_ready(sof_handle_t);
 extern void	sof_bypass(sof_handle_t);
 extern void	*sof_get_cookie(sof_handle_t);
 extern void 	*sof_cas_cookie(sof_handle_t, void *, void *);
-extern int	sof_inject_data_out(sof_handle_t, mblk_t *, struct nmsghdr *,
+extern int	sof_inject_data_out(sof_handle_t, mblk_t *, struct msghdr *,
     boolean_t *);
 extern int	sof_inject_data_in(sof_handle_t, mblk_t *, size_t, int,
     boolean_t *);
diff --git a/kernel/comstar/port/iscsit/iscsit_radiuspacket.c b/kernel/comstar/port/iscsit/iscsit_radiuspacket.c
index 912158cb2d..478b8cbab5 100644
--- a/kernel/comstar/port/iscsit/iscsit_radiuspacket.c
+++ b/kernel/comstar/port/iscsit/iscsit_radiuspacket.c
@@ -177,7 +177,7 @@ iscsit_rcv_radius_response(ksocket_t socket, uint8_t *shared_secret,
 	size_t			received_len = 0;
 
 	struct iovec		iov[1];
-	struct nmsghdr		msg;
+	struct msghdr		msg;
 
 	tmp_data = kmem_zalloc(MAX_RAD_PACKET_LEN, KM_SLEEP);
 	iov[0].iov_base = (char *)tmp_data;
diff --git a/kernel/fs/sockfs/sock_notsupp.c b/kernel/fs/sockfs/sock_notsupp.c
index ea612d298d..9228a3e78e 100644
--- a/kernel/fs/sockfs/sock_notsupp.c
+++ b/kernel/fs/sockfs/sock_notsupp.c
@@ -108,7 +108,7 @@ sock_send_notsupp(sock_lower_handle_t handle, mblk_t *mp,
 /*ARGSUSED*/
 int
 sock_senduio_notsupp(sock_lower_handle_t handle, struct uio *uiop,
-    struct nmsghdr *msg, struct cred *cr)
+    struct msghdr *msg, struct cred *cr)
 {
 	return (EOPNOTSUPP);
 }
@@ -116,7 +116,7 @@ sock_senduio_notsupp(sock_lower_handle_t handle, struct uio *uiop,
 /*ARGSUSED*/
 int
 sock_recvuio_notsupp(sock_lower_handle_t handle, struct uio *uiop,
-    struct nmsghdr *msg, struct cred *cr)
+    struct msghdr *msg, struct cred *cr)
 {
 	return (EOPNOTSUPP);
 }
diff --git a/kernel/fs/sockfs/sockcommon.c b/kernel/fs/sockfs/sockcommon.c
index bf5ac18a82..50154b147e 100644
--- a/kernel/fs/sockfs/sockcommon.c
+++ b/kernel/fs/sockfs/sockcommon.c
@@ -300,7 +300,7 @@ socket_setsockopt(struct sonode *so, int level, int option_name,
 }
 
 int
-socket_sendmsg(struct sonode *so, struct nmsghdr *msg, struct uio *uiop,
+socket_sendmsg(struct sonode *so, struct msghdr *msg, struct uio *uiop,
     cred_t *cr)
 {
 	int error = 0;
@@ -336,7 +336,7 @@ socket_sendmsg(struct sonode *so, struct nmsghdr *msg, struct uio *uiop,
 }
 
 int
-socket_sendmblk(struct sonode *so, struct nmsghdr *msg, int fflag,
+socket_sendmblk(struct sonode *so, struct msghdr *msg, int fflag,
     struct cred *cr, mblk_t **mpp)
 {
 	int error = 0;
@@ -349,7 +349,7 @@ socket_sendmblk(struct sonode *so, struct nmsghdr *msg, int fflag,
 }
 
 int
-socket_recvmsg(struct sonode *so, struct nmsghdr *msg, struct uio *uiop,
+socket_recvmsg(struct sonode *so, struct msghdr *msg, struct uio *uiop,
     cred_t *cr)
 {
 	int error;
diff --git a/kernel/fs/sockfs/sockcommon.h b/kernel/fs/sockfs/sockcommon.h
index 271563ab9d..8e574e343f 100644
--- a/kernel/fs/sockfs/sockcommon.h
+++ b/kernel/fs/sockfs/sockcommon.h
@@ -64,11 +64,11 @@ extern int socket_getsockopt(struct sonode *, int, int, void *, socklen_t *,
     int, struct cred *);
 extern int socket_setsockopt(struct sonode *, int, int, const void *,
     socklen_t, struct cred *);
-extern int socket_recvmsg(struct sonode *, struct nmsghdr *, struct uio *,
+extern int socket_recvmsg(struct sonode *, struct msghdr *, struct uio *,
     struct cred *);
-extern int socket_sendmsg(struct sonode *, struct nmsghdr *, struct uio *,
+extern int socket_sendmsg(struct sonode *, struct msghdr *, struct uio *,
     struct cred *);
-extern int socket_sendmblk(struct sonode *, struct nmsghdr *, int,
+extern int socket_sendmblk(struct sonode *, struct msghdr *, int,
     struct cred *, mblk_t **);
 extern int socket_ioctl(struct sonode *, int, intptr_t, int, struct cred *,
     int32_t *);
@@ -110,7 +110,7 @@ extern int so_accept_notsupp(struct sonode *, int, struct cred *,
 extern int so_getpeername_notsupp(struct sonode *, struct sockaddr *,
     socklen_t *, boolean_t, struct cred *);
 extern int so_shutdown_notsupp(struct sonode *, int, struct cred *);
-extern int so_sendmblk_notsupp(struct sonode *, struct nmsghdr *,
+extern int so_sendmblk_notsupp(struct sonode *, struct msghdr *,
     int, struct cred *, mblk_t **);
 
 /* Common sonode ops */
@@ -133,13 +133,13 @@ extern int so_ioctl(struct sonode *, int, intptr_t, int, struct cred *,
     int32_t *);
 extern int so_poll(struct sonode *, short, int, short *,
     struct pollhead **);
-extern int so_sendmsg(struct sonode *, struct nmsghdr *, struct uio *,
+extern int so_sendmsg(struct sonode *, struct msghdr *, struct uio *,
     struct cred *);
-extern int so_sendmblk_impl(struct sonode *, struct nmsghdr *, int,
+extern int so_sendmblk_impl(struct sonode *, struct msghdr *, int,
     struct cred *, mblk_t **, struct sof_instance *, boolean_t);
-extern int so_sendmblk(struct sonode *, struct nmsghdr *, int,
+extern int so_sendmblk(struct sonode *, struct msghdr *, int,
     struct cred *, mblk_t **);
-extern int so_recvmsg(struct sonode *, struct nmsghdr *, struct uio *,
+extern int so_recvmsg(struct sonode *, struct msghdr *, struct uio *,
     struct cred *);
 extern int so_shutdown(struct sonode *, int, struct cred *);
 extern int so_close(struct sonode *, int, struct cred *);
@@ -193,7 +193,7 @@ extern mblk_t 	*socopyoutuio(mblk_t *, struct uio *, ssize_t, int *);
 
 extern boolean_t somsghasdata(mblk_t *);
 extern void	so_rcv_flush(struct sonode *);
-extern int	sorecvoob(struct sonode *, struct nmsghdr *, struct uio *,
+extern int	sorecvoob(struct sonode *, struct msghdr *, struct uio *,
 		    int, boolean_t);
 
 extern void	so_timer_callback(void *);
diff --git a/kernel/fs/sockfs/sockcommon_sops.c b/kernel/fs/sockfs/sockcommon_sops.c
index 6fc66c374e..a63297e7cd 100644
--- a/kernel/fs/sockfs/sockcommon_sops.c
+++ b/kernel/fs/sockfs/sockcommon_sops.c
@@ -328,7 +328,7 @@ so_accept(struct sonode *so, int fflag, struct cred *cr, struct sonode **nsop)
 }
 
 int
-so_sendmsg(struct sonode *so, struct nmsghdr *msg, struct uio *uiop,
+so_sendmsg(struct sonode *so, struct msghdr *msg, struct uio *uiop,
     struct cred *cr)
 {
 	int error, flags;
@@ -436,7 +436,7 @@ so_sendmsg(struct sonode *so, struct nmsghdr *msg, struct uio *uiop,
 }
 
 int
-so_sendmblk_impl(struct sonode *so, struct nmsghdr *msg, int fflag,
+so_sendmblk_impl(struct sonode *so, struct msghdr *msg, int fflag,
     struct cred *cr, mblk_t **mpp, sof_instance_t *fil,
     boolean_t fil_inject)
 {
@@ -534,7 +534,7 @@ so_sendmblk_impl(struct sonode *so, struct nmsghdr *msg, int fflag,
 #pragma inline(so_sendmblk_impl)
 
 int
-so_sendmblk(struct sonode *so, struct nmsghdr *msg, int fflag,
+so_sendmblk(struct sonode *so, struct msghdr *msg, int fflag,
     struct cred *cr, mblk_t **mpp)
 {
 	int error;
@@ -1526,7 +1526,7 @@ so_set_error(sock_upper_handle_t sock_handle, int error)
  * whether the protocol has a sd_recv_uio down call.
  */
 int
-so_recvmsg(struct sonode *so, struct nmsghdr *msg, struct uio *uiop,
+so_recvmsg(struct sonode *so, struct msghdr *msg, struct uio *uiop,
     struct cred *cr)
 {
 	rval_t 		rval;
diff --git a/kernel/fs/sockfs/sockcommon_subr.c b/kernel/fs/sockfs/sockcommon_subr.c
index d949ae097f..65950d8cf7 100644
--- a/kernel/fs/sockfs/sockcommon_subr.c
+++ b/kernel/fs/sockfs/sockcommon_subr.c
@@ -1125,7 +1125,7 @@ so_rcv_flush(struct sonode *so)
  * Handle recv* calls that set MSG_OOB or MSG_OOB together with MSG_PEEK.
  */
 int
-sorecvoob(struct sonode *so, struct nmsghdr *msg, struct uio *uiop, int flags,
+sorecvoob(struct sonode *so, struct msghdr *msg, struct uio *uiop, int flags,
     boolean_t oob_inline)
 {
 	mblk_t		*mp, *nmp;
diff --git a/kernel/fs/sockfs/sockcommon_vnops.c b/kernel/fs/sockfs/sockcommon_vnops.c
index 40a5cc4693..c720488094 100644
--- a/kernel/fs/sockfs/sockcommon_vnops.c
+++ b/kernel/fs/sockfs/sockcommon_vnops.c
@@ -171,7 +171,7 @@ socket_vop_read(struct vnode *vp, struct uio *uiop, int ioflag, struct cred *cr,
     caller_context_t *ct)
 {
 	struct sonode *so = VTOSO(vp);
-	struct nmsghdr lmsg;
+	struct msghdr lmsg;
 
 	ASSERT(vp->v_type == VSOCK);
 	bzero((void *)&lmsg, sizeof (lmsg));
@@ -185,7 +185,7 @@ socket_vop_write(struct vnode *vp, struct uio *uiop, int ioflag,
     struct cred *cr, caller_context_t *ct)
 {
 	struct sonode *so = VTOSO(vp);
-	struct nmsghdr lmsg;
+	struct msghdr lmsg;
 
 	ASSERT(vp->v_type == VSOCK);
 	bzero((void *)&lmsg, sizeof (lmsg));
diff --git a/kernel/fs/sockfs/sockfilter.c b/kernel/fs/sockfs/sockfilter.c
index cea54ed2a5..5ea09e8f3e 100644
--- a/kernel/fs/sockfs/sockfilter.c
+++ b/kernel/fs/sockfs/sockfilter.c
@@ -1267,7 +1267,7 @@ sof_rval2errno(sof_rval_t rval)
  */
 mblk_t *
 sof_filter_data_out_from(struct sonode *so, sof_instance_t *start,
-    mblk_t *mp, struct nmsghdr *msg, cred_t *cr, int *errp)
+    mblk_t *mp, struct msghdr *msg, cred_t *cr, int *errp)
 {
 	sof_instance_t *inst;
 	sof_rval_t rval;
@@ -1701,7 +1701,7 @@ sof_cas_cookie(sof_handle_t handle, void *old, void *new)
  * before it is transmitted and may end up modifying or freeing the data.
  */
 int
-sof_inject_data_out(sof_handle_t handle, mblk_t *mp, struct nmsghdr *msg,
+sof_inject_data_out(sof_handle_t handle, mblk_t *mp, struct msghdr *msg,
     boolean_t *flowctrld)
 {
 	sof_instance_t *inst = (sof_instance_t *)handle;
diff --git a/kernel/fs/sockfs/sockfilter_impl.h b/kernel/fs/sockfs/sockfilter_impl.h
index 7f7aece1f1..3a6c8ff289 100644
--- a/kernel/fs/sockfs/sockfilter_impl.h
+++ b/kernel/fs/sockfs/sockfilter_impl.h
@@ -180,7 +180,7 @@ extern int	sof_rval2errno(sof_rval_t);
 	return (-1);
 
 extern mblk_t	*sof_filter_data_out_from(struct sonode *so,
-    sof_instance_t *, mblk_t *, struct nmsghdr *, cred_t *, int *);
+    sof_instance_t *, mblk_t *, struct msghdr *, cred_t *, int *);
 extern mblk_t	*sof_filter_data_in_proc(struct sonode *so,
     mblk_t *, mblk_t **);
 extern int	sof_filter_bind(struct sonode *, struct sockaddr *,
diff --git a/kernel/fs/sockfs/socksyscalls.c b/kernel/fs/sockfs/socksyscalls.c
index 6857e55817..74d20de946 100644
--- a/kernel/fs/sockfs/socksyscalls.c
+++ b/kernel/fs/sockfs/socksyscalls.c
@@ -803,7 +803,7 @@ shutdown(int sock, int how)
  */
 static ssize_t
 recvit(int sock,
-	struct nmsghdr *msg,
+	struct msghdr *msg,
 	struct uio *uiop,
 	int flags,
 	socklen_t *namelenp,
@@ -910,7 +910,7 @@ err:
 ssize_t
 recv(int sock, void *buffer, size_t len, int flags)
 {
-	struct nmsghdr lmsg;
+	struct msghdr lmsg;
 	struct uio auio;
 	struct iovec aiov[1];
 
@@ -940,7 +940,7 @@ ssize_t
 recvfrom(int sock, void *buffer, size_t len, int flags,
 	struct sockaddr *name, socklen_t *namelenp)
 {
-	struct nmsghdr lmsg;
+	struct msghdr lmsg;
 	struct uio auio;
 	struct iovec aiov[1];
 
@@ -975,11 +975,11 @@ recvfrom(int sock, void *buffer, size_t len, int flags,
 }
 
 ssize_t
-recvmsg(int sock, struct nmsghdr *msg, int flags)
+recvmsg(int sock, struct msghdr *msg, int flags)
 {
-	STRUCT_DECL(nmsghdr, u_lmsg);
-	STRUCT_HANDLE(nmsghdr, umsgptr);
-	struct nmsghdr lmsg;
+	STRUCT_DECL(msghdr, u_lmsg);
+	STRUCT_HANDLE(msghdr, umsgptr);
+	struct msghdr lmsg;
 	struct uio auio;
 	struct iovec buf[IOV_MAX_STACK], *aiov = buf;
 	ssize_t iovsize = 0;
@@ -1118,7 +1118,7 @@ recvmsg(int sock, struct nmsghdr *msg, int flags)
  * Common send function.
  */
 static ssize_t
-sendit(int sock, struct nmsghdr *msg, struct uio *uiop, int flags)
+sendit(int sock, struct msghdr *msg, struct uio *uiop, int flags)
 {
 	struct sonode *so;
 	file_t *fp;
@@ -1207,7 +1207,7 @@ done3:
 ssize_t
 send(int sock, void *buffer, size_t len, int flags)
 {
-	struct nmsghdr lmsg;
+	struct msghdr lmsg;
 	struct uio auio;
 	struct iovec aiov[1];
 
@@ -1233,10 +1233,10 @@ send(int sock, void *buffer, size_t len, int flags)
 }
 
 ssize_t
-sendmsg(int sock, struct nmsghdr *msg, int flags)
+sendmsg(int sock, struct msghdr *msg, int flags)
 {
-	struct nmsghdr lmsg;
-	STRUCT_DECL(nmsghdr, u_lmsg);
+	struct msghdr lmsg;
+	STRUCT_DECL(msghdr, u_lmsg);
 	struct uio auio;
 	struct iovec buf[IOV_MAX_STACK], *aiov = buf;
 	ssize_t iovsize = 0;
@@ -1362,7 +1362,7 @@ ssize_t
 sendto(int sock, void *buffer, size_t len, int flags,
     struct sockaddr *name, socklen_t namelen)
 {
-	struct nmsghdr lmsg;
+	struct msghdr lmsg;
 	struct uio auio;
 	struct iovec aiov[1];
 
@@ -2244,7 +2244,7 @@ snf_direct_io(file_t *fp, file_t *rfp, u_offset_t fileoff, u_offset_t size,
 	short fflag;
 	struct vnode *vp;
 	int ksize;
-	struct nmsghdr msg;
+	struct msghdr msg;
 
 	ksize = 0;
 	*count = 0;
@@ -2407,7 +2407,7 @@ snf_segmap(file_t *fp, vnode_t *fvp, u_offset_t fileoff, u_offset_t total_size,
 	int ksize;
 	struct vattr va;
 	boolean_t dowait = B_FALSE;
-	struct nmsghdr msg;
+	struct msghdr msg;
 
 	vp = fp->f_vnode;
 	fflag = fp->f_flag;
@@ -2660,7 +2660,7 @@ snf_cache(file_t *fp, vnode_t *fvp, u_offset_t fileoff, u_offset_t size,
 	int maxblk = 0;
 	int wroff = 0;
 	struct sonode *so;
-	struct nmsghdr msg;
+	struct msghdr msg;
 
 	vp = fp->f_vnode;
 	if (vp->v_type == VSOCK) {
@@ -2961,13 +2961,13 @@ soconnect(struct sonode *so, struct sockaddr *name, socklen_t namelen,
 }
 
 int
-sorecvmsg(struct sonode *so, struct nmsghdr *msg, struct uio *uiop)
+sorecvmsg(struct sonode *so, struct msghdr *msg, struct uio *uiop)
 {
 	return (socket_recvmsg(so, msg, uiop, CRED()));
 }
 
 int
-sosendmsg(struct sonode *so, struct nmsghdr *msg, struct uio *uiop)
+sosendmsg(struct sonode *so, struct msghdr *msg, struct uio *uiop)
 {
 	return (socket_sendmsg(so, msg, uiop, CRED()));
 }
diff --git a/kernel/fs/sockfs/socktpi.c b/kernel/fs/sockfs/socktpi.c
index 28387f414d..a9f0341135 100644
--- a/kernel/fs/sockfs/socktpi.c
+++ b/kernel/fs/sockfs/socktpi.c
@@ -209,11 +209,11 @@ static int	sotpi_bind(struct sonode *, struct sockaddr *, socklen_t,
 static int	sotpi_listen(struct sonode *, int, struct cred *);
 static int	sotpi_connect(struct sonode *, struct sockaddr *,
 		    socklen_t, int, int, struct cred *);
-extern int	sotpi_recvmsg(struct sonode *, struct nmsghdr *,
+extern int	sotpi_recvmsg(struct sonode *, struct msghdr *,
 		    struct uio *, struct cred *);
-static int	sotpi_sendmsg(struct sonode *, struct nmsghdr *,
+static int	sotpi_sendmsg(struct sonode *, struct msghdr *,
 		    struct uio *, struct cred *);
-static int	sotpi_sendmblk(struct sonode *, struct nmsghdr *, int,
+static int	sotpi_sendmblk(struct sonode *, struct msghdr *, int,
 		    struct cred *, mblk_t **);
 static int	sosend_dgramcmsg(struct sonode *, struct sockaddr *, socklen_t,
 		    struct uio *, void *, t_uscalar_t, int);
@@ -2844,7 +2844,7 @@ sorecv_update_oobstate(struct sonode *so)
  */
 /* ARGSUSED */
 int
-sotpi_recvmsg(struct sonode *so, struct nmsghdr *msg, struct uio *uiop,
+sotpi_recvmsg(struct sonode *so, struct msghdr *msg, struct uio *uiop,
     struct cred *cr)
 {
 	union T_primitives	*tpr;
@@ -3929,7 +3929,7 @@ sosend_svc(struct sonode *so, struct uio *uiop, t_scalar_t prim, int more,
  * after sending the message.
  */
 static int
-sotpi_sendmsg(struct sonode *so, struct nmsghdr *msg, struct uio *uiop,
+sotpi_sendmsg(struct sonode *so, struct msghdr *msg, struct uio *uiop,
     struct cred *cr)
 {
 	int		so_state;
@@ -4296,7 +4296,7 @@ kstrwritemp(struct vnode *vp, mblk_t *mp, ushort_t fmode)
 
 /* ARGSUSED */
 static int
-sotpi_sendmblk(struct sonode *so, struct nmsghdr *msg, int fflag,
+sotpi_sendmblk(struct sonode *so, struct msghdr *msg, int fflag,
     struct cred *cr, mblk_t **mpp)
 {
 	int error;
diff --git a/kernel/net/ip/icmp.c b/kernel/net/ip/icmp.c
index b37bf97800..fe2bca2cad 100644
--- a/kernel/net/ip/icmp.c
+++ b/kernel/net/ip/icmp.c
@@ -3277,7 +3277,7 @@ icmp_output_attach_policy(mblk_t *mp, conn_t *connp, ip_xmit_attr_t *ixa)
  */
 static int
 icmp_output_ancillary(conn_t *connp, sin_t *sin, sin6_t *sin6, mblk_t *mp,
-    mblk_t *tudr_mp, struct nmsghdr *msg, cred_t *cr, pid_t pid)
+    mblk_t *tudr_mp, struct msghdr *msg, cred_t *cr, pid_t pid)
 {
 	icmp_t		*icmp = connp->conn_icmp;
 	icmp_stack_t	*is = icmp->icmp_is;
@@ -5498,7 +5498,7 @@ rawip_ioctl(sock_lower_handle_t proto_handle, int cmd, intptr_t arg,
 }
 
 int
-rawip_send(sock_lower_handle_t proto_handle, mblk_t *mp, struct nmsghdr *msg,
+rawip_send(sock_lower_handle_t proto_handle, mblk_t *mp, struct msghdr *msg,
     cred_t *cr)
 {
 	sin6_t		*sin6;
diff --git a/kernel/net/ip/rts.c b/kernel/net/ip/rts.c
index 62e47c3496..b87695017e 100644
--- a/kernel/net/ip/rts.c
+++ b/kernel/net/ip/rts.c
@@ -1417,7 +1417,7 @@ rts_setsockopt(sock_lower_handle_t proto_handle, int level, int option_name,
 /* ARGSUSED */
 static int
 rts_send(sock_lower_handle_t proto_handle, mblk_t *mp,
-    struct nmsghdr *msg, cred_t *cr)
+    struct msghdr *msg, cred_t *cr)
 {
 	conn_t  *connp = (conn_t *)proto_handle;
 	rt_msghdr_t	*rtm;
diff --git a/kernel/net/sockmods/sockmod_pfp.c b/kernel/net/sockmods/sockmod_pfp.c
index 1edb02a01a..2533c5b1a0 100644
--- a/kernel/net/sockmods/sockmod_pfp.c
+++ b/kernel/net/sockmods/sockmod_pfp.c
@@ -86,7 +86,7 @@ static int sdpfp_getsockopt(sock_lower_handle_t, int, int, void *,
     socklen_t *, struct cred *);
 static int sdpfp_ioctl(sock_lower_handle_t, int, intptr_t, int, int32_t *,
     struct cred *);
-static int sdpfp_senduio(sock_lower_handle_t, struct uio *, struct nmsghdr *,
+static int sdpfp_senduio(sock_lower_handle_t, struct uio *, struct msghdr *,
     struct cred *);
 static int sdpfp_setsockopt(sock_lower_handle_t, int, int, const void *,
     socklen_t, struct cred *);
@@ -733,7 +733,7 @@ sdpfp_setsockopt(sock_lower_handle_t handle, int level, int option_name,
 /* ARGSUSED */
 static int
 sdpfp_senduio(sock_lower_handle_t handle, struct uio *uiop,
-    struct nmsghdr *msg, struct cred *cred)
+    struct msghdr *msg, struct cred *cred)
 {
 	struct sockaddr_ll *sol;
 	mac_client_handle_t mch;
diff --git a/kernel/net/sockmods/socksctp.c b/kernel/net/sockmods/socksctp.c
index daaa1dc2e0..3bf07a4455 100644
--- a/kernel/net/sockmods/socksctp.c
+++ b/kernel/net/sockmods/socksctp.c
@@ -65,9 +65,9 @@ static int sosctp_bind(struct sonode *, struct sockaddr *, socklen_t, int,
 static int sosctp_listen(struct sonode *, int, struct cred *);
 static int sosctp_connect(struct sonode *, struct sockaddr *, socklen_t,
     int, int, struct cred *);
-static int sosctp_recvmsg(struct sonode *, struct nmsghdr *, struct uio *,
+static int sosctp_recvmsg(struct sonode *, struct msghdr *, struct uio *,
     struct cred *);
-static int sosctp_sendmsg(struct sonode *, struct nmsghdr *, struct uio *,
+static int sosctp_sendmsg(struct sonode *, struct msghdr *, struct uio *,
     struct cred *);
 static int sosctp_getpeername(struct sonode *, struct sockaddr *, socklen_t *,
     boolean_t, struct cred *);
@@ -88,7 +88,7 @@ void sosctp_fini(struct sonode *, struct cred *);
  */
 static int sosctp_seq_connect(struct sonode *, struct sockaddr *,
     socklen_t, int, int, struct cred *);
-static int sosctp_seq_sendmsg(struct sonode *, struct nmsghdr *, struct uio *,
+static int sosctp_seq_sendmsg(struct sonode *, struct msghdr *, struct uio *,
     struct cred *);
 
 /*
@@ -472,7 +472,7 @@ done:
  */
 /* ARGSUSED */
 static int
-sosctp_recvmsg(struct sonode *so, struct nmsghdr *msg, struct uio *uiop,
+sosctp_recvmsg(struct sonode *so, struct msghdr *msg, struct uio *uiop,
     struct cred *cr)
 {
 	struct sctp_sonode *ss = SOTOSSO(so);
@@ -717,7 +717,7 @@ sosctp_uiomove(mblk_t *hdr_mp, ssize_t count, ssize_t blk_size, int wroff,
  * Send message.
  */
 static int
-sosctp_sendmsg(struct sonode *so, struct nmsghdr *msg, struct uio *uiop,
+sosctp_sendmsg(struct sonode *so, struct msghdr *msg, struct uio *uiop,
     struct cred *cr)
 {
 	mblk_t *mctl;
@@ -915,7 +915,7 @@ error_nofree:
  * no association.
  */
 static int
-sosctp_seq_sendmsg(struct sonode *so, struct nmsghdr *msg, struct uio *uiop,
+sosctp_seq_sendmsg(struct sonode *so, struct msghdr *msg, struct uio *uiop,
     struct cred *cr)
 {
 	struct sctp_sonode *ss;
diff --git a/kernel/net/sockmods/socksctp.h b/kernel/net/sockmods/socksctp.h
index 9558972670..d3426f156b 100644
--- a/kernel/net/sockmods/socksctp.h
+++ b/kernel/net/sockmods/socksctp.h
@@ -95,7 +95,7 @@ extern void sosctp_aid_reserve(struct sctp_sonode *ss, sctp_assoc_t id,
     int incr);
 extern struct cmsghdr *sosctp_find_cmsg(const uchar_t *control, socklen_t clen,
     int type);
-extern void sosctp_pack_cmsg(const uchar_t *, struct nmsghdr *, int);
+extern void sosctp_pack_cmsg(const uchar_t *, struct msghdr *, int);
 
 extern int sosctp_assoc(struct sctp_sonode *ss, sctp_assoc_t id,
     struct sctp_soassoc **ssa);
diff --git a/kernel/net/sockmods/socksctpsubr.c b/kernel/net/sockmods/socksctpsubr.c
index a57848e6a6..4810b2aa0a 100644
--- a/kernel/net/sockmods/socksctpsubr.c
+++ b/kernel/net/sockmods/socksctpsubr.c
@@ -215,7 +215,7 @@ sosctp_assoc_free(struct sctp_sonode *ss, struct sctp_soassoc *ssa)
  * not need this routine.
  */
 void
-sosctp_pack_cmsg(const uchar_t *opt, struct nmsghdr *msg, int len)
+sosctp_pack_cmsg(const uchar_t *opt, struct msghdr *msg, int len)
 {
 	struct cmsghdr	*ocmsg;
 	struct cmsghdr	*cmsg;
diff --git a/kernel/net/sockmods/socksdp.c b/kernel/net/sockmods/socksdp.c
index a8baf96697..0d72428ac4 100644
--- a/kernel/net/sockmods/socksdp.c
+++ b/kernel/net/sockmods/socksdp.c
@@ -62,9 +62,9 @@ static int sosdp_bind(struct sonode *, struct sockaddr *, socklen_t, int,
 static int sosdp_listen(struct sonode *, int, struct cred *);
 static int sosdp_connect(struct sonode *, struct sockaddr *, socklen_t,
     int, int, struct cred *);
-static int sosdp_recvmsg(struct sonode *, struct nmsghdr *, struct uio *,
+static int sosdp_recvmsg(struct sonode *, struct msghdr *, struct uio *,
     struct cred *);
-static int sosdp_sendmsg(struct sonode *, struct nmsghdr *, struct uio *,
+static int sosdp_sendmsg(struct sonode *, struct msghdr *, struct uio *,
     struct cred *);
 static int sosdp_getpeername(struct sonode *, struct sockaddr *, socklen_t *,
     boolean_t, struct cred *);
@@ -412,7 +412,7 @@ done:
  */
 /* ARGSUSED */
 int
-sosdp_recvmsg(struct sonode *so, struct nmsghdr *msg, struct uio *uiop,
+sosdp_recvmsg(struct sonode *so, struct msghdr *msg, struct uio *uiop,
     struct cred *cr)
 {
 	int flags, error = 0;
@@ -478,7 +478,7 @@ done:
  */
 /* ARGSUSED */
 static int
-sosdp_sendmsg(struct sonode *so, struct nmsghdr *msg, struct uio *uiop,
+sosdp_sendmsg(struct sonode *so, struct msghdr *msg, struct uio *uiop,
     struct cred *cr)
 {
 	int flags;
diff --git a/kernel/net/tcp/tcp_socket.c b/kernel/net/tcp/tcp_socket.c
index a431bf63d1..80df12b99d 100644
--- a/kernel/net/tcp/tcp_socket.c
+++ b/kernel/net/tcp/tcp_socket.c
@@ -62,7 +62,7 @@ static int	tcp_getsockopt(sock_lower_handle_t, int, int, void *,
 		    socklen_t *, cred_t *);
 static int	tcp_setsockopt(sock_lower_handle_t, int, int, const void *,
 		    socklen_t, cred_t *);
-static int	tcp_sendmsg(sock_lower_handle_t, mblk_t *, struct nmsghdr *,
+static int	tcp_sendmsg(sock_lower_handle_t, mblk_t *, struct msghdr *,
 		    cred_t *);
 static int	tcp_shutdown(sock_lower_handle_t, int, cred_t *);
 static void	tcp_clr_flowctrl(sock_lower_handle_t);
@@ -478,7 +478,7 @@ tcp_setsockopt(sock_lower_handle_t proto_handle, int level, int option_name,
 
 /* ARGSUSED */
 static int
-tcp_sendmsg(sock_lower_handle_t proto_handle, mblk_t *mp, struct nmsghdr *msg,
+tcp_sendmsg(sock_lower_handle_t proto_handle, mblk_t *mp, struct msghdr *msg,
     cred_t *cr)
 {
 	tcp_t		*tcp;
diff --git a/kernel/net/udp/udp.c b/kernel/net/udp/udp.c
index cc290d2a0e..fe84cc009c 100644
--- a/kernel/net/udp/udp.c
+++ b/kernel/net/udp/udp.c
@@ -2521,7 +2521,7 @@ retry:
  */
 static int
 udp_output_ancillary(conn_t *connp, sin_t *sin, sin6_t *sin6, mblk_t *mp,
-    mblk_t *tudr_mp, struct nmsghdr *msg, cred_t *cr, pid_t pid)
+    mblk_t *tudr_mp, struct msghdr *msg, cred_t *cr, pid_t pid)
 {
 	udp_t		*udp = connp->conn_udp;
 	udp_stack_t	*us = udp->udp_us;
@@ -5619,7 +5619,7 @@ done:
 }
 
 int
-udp_send(sock_lower_handle_t proto_handle, mblk_t *mp, struct nmsghdr *msg,
+udp_send(sock_lower_handle_t proto_handle, mblk_t *mp, struct msghdr *msg,
     cred_t *cr)
 {
 	sin6_t		*sin6;
diff --git a/kernel/os/sysent.c b/kernel/os/sysent.c
index 62142258c6..1de0fdf029 100644
--- a/kernel/os/sysent.c
+++ b/kernel/os/sysent.c
@@ -318,9 +318,9 @@ int	connect(int, struct sockaddr *, socklen_t, int);
 int	shutdown(int, int, int);
 ssize_t	recv(int, void *, size_t, int);
 ssize_t	recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *);
-ssize_t	recvmsg(int, struct nmsghdr *, int);
+ssize_t	recvmsg(int, struct msghdr *, int);
 ssize_t	send(int, void *, size_t, int);
-ssize_t	sendmsg(int, struct nmsghdr *, int);
+ssize_t	sendmsg(int, struct msghdr *, int);
 ssize_t	sendto(int, void *, size_t, int, struct sockaddr *, socklen_t);
 int	getpeername(int, struct sockaddr *, socklen_t *, int);
 int	getsockname(int, struct sockaddr *, socklen_t *, int);
diff --git a/kernel/syscall/sendfile.c b/kernel/syscall/sendfile.c
index 70f595b7d6..b02b316319 100644
--- a/kernel/syscall/sendfile.c
+++ b/kernel/syscall/sendfile.c
@@ -416,7 +416,7 @@ sendvec_small_chunk(file_t *fp, u_offset_t *fileoff, struct sendfilevec *sfv,
 	size_t  size = total_size;
 	size_t  extra;
 	int tail_len;
-	struct nmsghdr msg;
+	struct msghdr msg;
 
 	fflag = fp->f_flag;
 	vp = fp->f_vnode;
@@ -704,7 +704,7 @@ sendvec_chunk(file_t *fp, u_offset_t *fileoff, struct sendfilevec *sfv,
 	int maxblk, wroff, tail_len;
 	struct sonode *so;
 	stdata_t *stp;
-	struct nmsghdr msg;
+	struct msghdr msg;
 
 	fflag = fp->f_flag;
 	vp = fp->f_vnode;
diff --git a/share/man/man7p/ip.7p b/share/man/man7p/ip.7p
index 27abc6a71b..f797a13efe 100644
--- a/share/man/man7p/ip.7p
+++ b/share/man/man7p/ip.7p
@@ -698,15 +698,6 @@ this machine.
 \fB\fBEINVAL\fR\fR
 .ad
 .RS 17n
-A \fBsendmsg()\fR operation with a non-NULL \fBmsg_accrights\fR was attempted.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBEINVAL\fR\fR
-.ad
-.RS 17n
 A \fBgetsockopt()\fR or \fBsetsockopt()\fR operation with an unknown socket
 option name was given.
 .RE
diff --git a/share/man/man7p/ip6.7p b/share/man/man7p/ip6.7p
index c196466c81..3e796f9be7 100644
--- a/share/man/man7p/ip6.7p
+++ b/share/man/man7p/ip6.7p
@@ -644,15 +644,6 @@ this machine.
 \fB\fBEINVAL\fR\fR
 .ad
 .RS 19n
-A \fBsendmsg()\fR operation with a non-NULL \fBmsg_accrights\fR was attempted.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBEINVAL\fR\fR
-.ad
-.RS 19n
 A \fBgetsockopt()\fR or \fBsetsockopt()\fR operation with an unknown socket
 option name was given.
 .RE
diff --git a/share/man/man7p/udp.7p b/share/man/man7p/udp.7p
index 723cbb8e6b..39c540fe5e 100644
--- a/share/man/man7p/udp.7p
+++ b/share/man/man7p/udp.7p
@@ -221,15 +221,6 @@ which no network interface exists.
 .sp
 .ne 2
 .na
-\fB\fBEINVAL\fR\fR
-.ad
-.RS 17n
-A \fBsendmsg()\fR operation with a non-NULL \fBmsg_accrights\fR was attempted.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fBEACCES\fR\fR
 .ad
 .RS 17n
diff --git a/usr/src/boot/sys/sys/socket.h b/usr/src/boot/sys/sys/socket.h
index c20b07522c..dd0c18b000 100644
--- a/usr/src/boot/sys/sys/socket.h
+++ b/usr/src/boot/sys/sys/socket.h
@@ -544,17 +544,6 @@ struct osockaddr {
 	char	sa_data[14];		/* up to 14 bytes of direct address */
 };
 
-/*
- * 4.3-compat message header (move to compat file later).
- */
-struct omsghdr {
-	char	*msg_name;		/* optional address */
-	int	msg_namelen;		/* size of address */
-	struct	iovec *msg_iov;		/* scatter/gather array */
-	int	msg_iovlen;		/* # elements in msg_iov */
-	char	*msg_accrights;		/* access rights sent/received */
-	int	msg_accrightslen;
-};
 #endif
 
 /*
diff --git a/usr/src/lib/libfakekernel/common/ksocket.c b/usr/src/lib/libfakekernel/common/ksocket.c
index 3543f76a85..32f906b29a 100644
--- a/usr/src/lib/libfakekernel/common/ksocket.c
+++ b/usr/src/lib/libfakekernel/common/ksocket.c
@@ -291,7 +291,7 @@ ksocket_sendto(ksocket_t ks, void *msg, size_t msglen, int flags,
 }
 
 int
-ksocket_sendmsg(ksocket_t ks, struct nmsghdr *msg, int flags,
+ksocket_sendmsg(ksocket_t ks, struct msghdr *msg, int flags,
     size_t *sent, struct cred *cr)
 {
 	uio_t uio;
@@ -393,7 +393,7 @@ ksocket_recvfrom(ksocket_t ks, void *msg, size_t msglen, int flags,
 }
 
 int
-ksocket_recvmsg(ksocket_t ks, struct nmsghdr *msg, int flags, size_t *recvd,
+ksocket_recvmsg(ksocket_t ks, struct msghdr *msg, int flags, size_t *recvd,
     struct cred *cr)
 {
 	ssize_t error;
diff --git a/usr/src/lib/libresolv2/common/bsd/writev.c b/usr/src/lib/libresolv2/common/bsd/writev.c
index 65baa71cfc..c0d20a4154 100644
--- a/usr/src/lib/libresolv2/common/bsd/writev.c
+++ b/usr/src/lib/libresolv2/common/bsd/writev.c
@@ -36,8 +36,6 @@ __writev(int fd, struct iovec *iov, int iovlen)
 		mesg.msg_namelen = 0;
 		mesg.msg_iov = iov;
 		mesg.msg_iovlen = iovlen;
-		mesg.msg_accrights = 0;
-		mesg.msg_accrightslen = 0;
 		return (sendmsg(fd, &mesg, 0));
 	} else {
 		struct iovec *tv;
diff --git a/usr/src/uts/common/fs/smbsrv/smb_opipe.c b/usr/src/uts/common/fs/smbsrv/smb_opipe.c
index 273a2f7297..4abd97e070 100644
--- a/usr/src/uts/common/fs/smbsrv/smb_opipe.c
+++ b/usr/src/uts/common/fs/smbsrv/smb_opipe.c
@@ -302,7 +302,7 @@ smb_opipe_close(smb_ofile_t *of)
 int
 smb_opipe_write(smb_request_t *sr, struct uio *uio)
 {
-	struct nmsghdr msghdr;
+	struct msghdr msghdr;
 	smb_ofile_t *ofile;
 	smb_opipe_t *opipe;
 	ksocket_t sock;
@@ -352,7 +352,7 @@ smb_opipe_write(smb_request_t *sr, struct uio *uio)
 int
 smb_opipe_read(smb_request_t *sr, struct uio *uio)
 {
-	struct nmsghdr msghdr;
+	struct msghdr msghdr;
 	smb_ofile_t *ofile;
 	smb_opipe_t *opipe;
 	ksocket_t sock;
diff --git a/usr/src/uts/common/io/ib/clients/rdsv3/af_rds.c b/usr/src/uts/common/io/ib/clients/rdsv3/af_rds.c
index 25ba47fd17..eac9a9472d 100644
--- a/usr/src/uts/common/io/ib/clients/rdsv3/af_rds.c
+++ b/usr/src/uts/common/io/ib/clients/rdsv3/af_rds.c
@@ -688,7 +688,7 @@ rdsv3_activate(sock_lower_handle_t proto_handle,
 /* ARGSUSED */
 int
 rdsv3_send_uio(sock_lower_handle_t proto_handle, uio_t *uio,
-    struct nmsghdr *msg, cred_t *cr)
+    struct msghdr *msg, cred_t *cr)
 {
 	struct rsock *sk = (struct rsock *)proto_handle;
 	struct rdsv3_sock *rs = rdsv3_sk_to_rs(sk);
@@ -708,7 +708,7 @@ rdsv3_send_uio(sock_lower_handle_t proto_handle, uio_t *uio,
 /* ARGSUSED */
 int
 rdsv3_recv_uio(sock_lower_handle_t proto_handle, uio_t *uio,
-    struct nmsghdr *msg, cred_t *cr)
+    struct msghdr *msg, cred_t *cr)
 {
 	struct rsock *sk = (struct rsock *)proto_handle;
 	struct rdsv3_sock *rs = rdsv3_sk_to_rs(sk);
diff --git a/usr/src/uts/common/io/ib/clients/rdsv3/rds_recv.c b/usr/src/uts/common/io/ib/clients/rdsv3/rds_recv.c
index 4c60636b38..d5e1ea82f1 100644
--- a/usr/src/uts/common/io/ib/clients/rdsv3/rds_recv.c
+++ b/usr/src/uts/common/io/ib/clients/rdsv3/rds_recv.c
@@ -453,7 +453,7 @@ rdsv3_cmsg_recv(struct rdsv3_incoming *inc, struct msghdr *msg)
 
 int
 rdsv3_recvmsg(struct rdsv3_sock *rs, uio_t *uio,
-    struct nmsghdr *msg, size_t size, int msg_flags)
+    struct msghdr *msg, size_t size, int msg_flags)
 {
 	struct rsock *sk = rdsv3_rs_to_sk(rs);
 	long timeo;
diff --git a/usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_impl.c b/usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_impl.c
index 412e0a7db9..290f2b0213 100644
--- a/usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_impl.c
+++ b/usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_impl.c
@@ -1092,7 +1092,7 @@ rdsv3_trans_init()
 }
 
 int
-rdsv3_put_cmsg(struct nmsghdr *msg, int level, int type, size_t size,
+rdsv3_put_cmsg(struct msghdr *msg, int level, int type, size_t size,
 	void *payload)
 {
 	struct cmsghdr *cp;
diff --git a/usr/src/uts/common/io/ib/clients/rdsv3/send.c b/usr/src/uts/common/io/ib/clients/rdsv3/send.c
index d488286b2b..96317df2d7 100644
--- a/usr/src/uts/common/io/ib/clients/rdsv3/send.c
+++ b/usr/src/uts/common/io/ib/clients/rdsv3/send.c
@@ -931,7 +931,7 @@ rdsv3_cmsg_send(struct rdsv3_sock *rs, struct rdsv3_message *rm,
 extern unsigned long rdsv3_max_bcopy_size;
 
 int
-rdsv3_sendmsg(struct rdsv3_sock *rs, uio_t *uio, struct nmsghdr *msg,
+rdsv3_sendmsg(struct rdsv3_sock *rs, uio_t *uio, struct msghdr *msg,
     size_t payload_len)
 {
 	struct rsock *sk = rdsv3_rs_to_sk(rs);
diff --git a/usr/src/uts/common/io/ksocket/ksocket.c b/usr/src/uts/common/io/ksocket/ksocket.c
index d08a888592..60b98f8c03 100644
--- a/usr/src/uts/common/io/ksocket/ksocket.c
+++ b/usr/src/uts/common/io/ksocket/ksocket.c
@@ -182,7 +182,7 @@ ksocket_send(ksocket_t ks, void *msg, size_t msglen, int flags,
     size_t *sent, struct cred *cr)
 {
 	int error;
-	struct nmsghdr msghdr;
+	struct msghdr msghdr;
 	struct uio auio;
 	struct iovec iov;
 
@@ -234,7 +234,7 @@ ksocket_sendto(ksocket_t ks, void *msg, size_t msglen, int flags,
     struct sockaddr *name, socklen_t namelen, size_t *sent, struct cred *cr)
 {
 	int error;
-	struct nmsghdr msghdr;
+	struct msghdr msghdr;
 	struct uio auio;
 	struct iovec iov;
 
@@ -283,7 +283,7 @@ ksocket_sendto(ksocket_t ks, void *msg, size_t msglen, int flags,
 }
 
 int
-ksocket_sendmsg(ksocket_t ks, struct nmsghdr *msg, int flags,
+ksocket_sendmsg(ksocket_t ks, struct msghdr *msg, int flags,
     size_t *sent, struct cred *cr)
 {
 	int error;
@@ -341,7 +341,7 @@ ksocket_recv(ksocket_t ks, void *msg, size_t msglen, int flags,
     size_t *recv, struct cred *cr)
 {
 	int error;
-	struct nmsghdr msghdr;
+	struct msghdr msghdr;
 	struct uio auio;
 	struct iovec iov;
 
@@ -394,7 +394,7 @@ ksocket_recvfrom(ksocket_t ks, void *msg, size_t msglen, int flags,
     struct sockaddr *name, socklen_t *namelen, size_t *recv, struct cred *cr)
 {
 	int error;
-	struct nmsghdr msghdr;
+	struct msghdr msghdr;
 	struct uio auio;
 	struct iovec iov;
 
@@ -445,7 +445,7 @@ ksocket_recvfrom(ksocket_t ks, void *msg, size_t msglen, int flags,
 }
 
 int
-ksocket_recvmsg(ksocket_t ks, struct nmsghdr *msg, int flags, size_t *recv,
+ksocket_recvmsg(ksocket_t ks, struct msghdr *msg, int flags, size_t *recv,
     struct cred *cr)
 {
 	int error;
@@ -855,7 +855,7 @@ out:
 }
 
 int
-ksocket_sendmblk(ksocket_t ks, struct nmsghdr *msg, int flags,
+ksocket_sendmblk(ksocket_t ks, struct msghdr *msg, int flags,
     mblk_t **mpp, cred_t *cr)
 {
 	struct		sonode *so;
diff --git a/usr/src/uts/common/io/scsi/adapters/iscsi/radius_packet.c b/usr/src/uts/common/io/scsi/adapters/iscsi/radius_packet.c
index fa36056b50..9e000c9bab 100644
--- a/usr/src/uts/common/io/scsi/adapters/iscsi/radius_packet.c
+++ b/usr/src/uts/common/io/scsi/adapters/iscsi/radius_packet.c
@@ -56,7 +56,7 @@ snd_radius_request(void *socket, iscsi_ipaddr_t rsvr_ip_addr,
 		struct sockaddr_in s_in4;
 		struct sockaddr_in6 s_in6;
 	} sa_rsvr;			/* Socket address of the server */
-	struct nmsghdr	msg;
+	struct msghdr	msg;
 	struct iovec	iov[1];
 
 	/*
@@ -171,7 +171,7 @@ rcv_radius_response(void *socket, uint8_t *shared_secret,
 	uint8_t			md5_digest[16]; /* MD5 Digest Length 16 */
 	uint16_t		declared_len = 0;
 	ushort_t		len;
-	struct nmsghdr		msg;
+	struct msghdr		msg;
 	struct iovec		iov[1];
 
 	tmp_data = kmem_zalloc(MAX_RAD_PACKET_LEN, KM_SLEEP);
diff --git a/usr/src/uts/common/io/trill.c b/usr/src/uts/common/io/trill.c
index 98cf335601..a008b4d807 100644
--- a/usr/src/uts/common/io/trill.c
+++ b/usr/src/uts/common/io/trill.c
@@ -1541,7 +1541,7 @@ trill_bind(sock_lower_handle_t proto_handle, struct sockaddr *sa,
 
 /* ARGSUSED */
 static int
-trill_send(sock_lower_handle_t proto_handle, mblk_t *mp, struct nmsghdr *msg,
+trill_send(sock_lower_handle_t proto_handle, mblk_t *mp, struct msghdr *msg,
     cred_t *cr)
 {
 	trill_sock_t *tsock = (trill_sock_t *)proto_handle;
-- 
2.11.4.GIT