diff options
author | Robert Watson <rwatson@FreeBSD.org> | 2004-03-01 03:14:23 +0000 |
---|---|---|
committer | Robert Watson <rwatson@FreeBSD.org> | 2004-03-01 03:14:23 +0000 |
commit | 746e5bf09b1bac72c432687fb613f5e9fbd4a6f2 (patch) | |
tree | 6b16845a701c80c2675bb9aed085227f806e915d /sys/netipx | |
parent | 30d4dd7ee9c6e52cdf9ee861caf3e6e1ee156507 (diff) | |
download | src-746e5bf09b1bac72c432687fb613f5e9fbd4a6f2.tar.gz src-746e5bf09b1bac72c432687fb613f5e9fbd4a6f2.zip |
Rename dup_sockaddr() to sodupsockaddr() for consistency with other
functions in kern_socket.c.
Rename the "canwait" field to "mflags" and pass M_WAITOK and M_NOWAIT
in from the caller context rather than "1" or "0".
Correct mflags pass into mac_init_socket() from previous commit to not
include M_ZERO.
Submitted by: sam
Notes
Notes:
svn path=/head/; revision=126425
Diffstat (limited to 'sys/netipx')
-rw-r--r-- | sys/netipx/ipx_pcb.c | 4 | ||||
-rw-r--r-- | sys/netipx/spx_usrreq.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c index 0cd7880c86fd..f4f42f60ae10 100644 --- a/sys/netipx/ipx_pcb.c +++ b/sys/netipx/ipx_pcb.c @@ -288,7 +288,7 @@ ipx_setsockaddr(ipxp, nam) sipx->sipx_len = sizeof(*sipx); sipx->sipx_family = AF_IPX; sipx->sipx_addr = ipxp->ipxp_laddr; - *nam = dup_sockaddr((struct sockaddr *)sipx, 0); + *nam = sodupsockaddr((struct sockaddr *)sipx, M_NOWAIT); } void @@ -303,7 +303,7 @@ ipx_setpeeraddr(ipxp, nam) sipx->sipx_len = sizeof(*sipx); sipx->sipx_family = AF_IPX; sipx->sipx_addr = ipxp->ipxp_faddr; - *nam = dup_sockaddr((struct sockaddr *)sipx, 0); + *nam = sodupsockaddr((struct sockaddr *)sipx, M_NOWAIT); } /* diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c index 1424754f74d0..ea47aba3d9b8 100644 --- a/sys/netipx/spx_usrreq.c +++ b/sys/netipx/spx_usrreq.c @@ -1302,7 +1302,7 @@ spx_accept(so, nam) sipx->sipx_len = sizeof *sipx; sipx->sipx_family = AF_IPX; sipx->sipx_addr = ipxp->ipxp_faddr; - *nam = dup_sockaddr((struct sockaddr *)sipx, 0); + *nam = sodupsockaddr((struct sockaddr *)sipx, M_NOWAIT); return (0); } |