diff options
| author | rwatson <rwatson@FreeBSD.org> | 2005-01-09 04:47:42 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2005-01-09 04:47:42 +0000 |
| commit | dbe7c51df6abf448367f1b6dd6785e0cc8b5815b (patch) | |
| tree | 05e56b103ff1a3ef62642d6a8ce2f3c147ea3932 /sys/netipx/ipx_pcb.c | |
| parent | 6307978aa0c4c7d8479947ac2df5348208026d0c (diff) | |
| download | FreeBSD-src-dbe7c51df6abf448367f1b6dd6785e0cc8b5815b.zip FreeBSD-src-dbe7c51df6abf448367f1b6dd6785e0cc8b5815b.tar.gz | |
In ipx_setsockaddr(), use M_WAITOK instead of M_NOWAIT so that the
call always succeeds, avoiding causing the caller to return success
even though the returned *sockaddr is NULL.
MFC after: 2 weeks
Diffstat (limited to 'sys/netipx/ipx_pcb.c')
| -rw-r--r-- | sys/netipx/ipx_pcb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c index 81b8c0d4..1649b2e 100644 --- a/sys/netipx/ipx_pcb.c +++ b/sys/netipx/ipx_pcb.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004 Robert N. M. Watson + * Copyright (c) 2004-2005 Robert N. M. Watson * Copyright (c) 1995, Mike Mitchell * Copyright (c) 1984, 1985, 1986, 1987, 1993 * The Regents of the University of California. All rights reserved. @@ -292,7 +292,7 @@ ipx_setsockaddr(ipxp, nam) sipx->sipx_len = sizeof(*sipx); sipx->sipx_family = AF_IPX; sipx->sipx_addr = ipxp->ipxp_laddr; - *nam = sodupsockaddr((struct sockaddr *)sipx, M_NOWAIT); + *nam = sodupsockaddr((struct sockaddr *)sipx, M_WAITOK); } void |
