diff options
| author | rtr <rtr@NetBSD.org> | 2014-08-05 05:24:26 +0000 |
|---|---|---|
| committer | rtr <rtr@NetBSD.org> | 2014-08-05 05:24:26 +0000 |
| commit | 0c9751c6689377700fd525ea68d2193cd230563b (patch) | |
| tree | f45f2684b43da5be0edc29a12d52b709f2f18ed8 /sys/netinet6/udp6_usrreq.c | |
| parent | 9de8cca700f91ec30ae60dea73954bbaf4d08d1b (diff) | |
revert the removal of struct lwp * parameter from bind, listen and connect
user requests.
this should resolve the issue relating to nfs client hangs presented
recently by wiz on current-users@
Diffstat (limited to 'sys/netinet6/udp6_usrreq.c')
| -rw-r--r-- | sys/netinet6/udp6_usrreq.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 0d885699315..c29c0a23df5 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -1,4 +1,4 @@ -/* $NetBSD: udp6_usrreq.c,v 1.111 2014/07/31 03:39:35 rtr Exp $ */ +/* $NetBSD: udp6_usrreq.c,v 1.112 2014/08/05 05:24:27 rtr Exp $ */ /* $KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.111 2014/07/31 03:39:35 rtr Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.112 2014/08/05 05:24:27 rtr Exp $"); #include "opt_inet.h" #include "opt_inet_csum.h" @@ -686,7 +686,7 @@ udp6_accept(struct socket *so, struct mbuf *nam) } static int -udp6_bind(struct socket *so, struct mbuf *nam) +udp6_bind(struct socket *so, struct mbuf *nam, struct lwp *l) { struct in6pcb *in6p = sotoin6pcb(so); int error = 0; @@ -696,13 +696,13 @@ udp6_bind(struct socket *so, struct mbuf *nam) KASSERT(in6p != NULL); s = splsoftnet(); - error = in6_pcbbind(in6p, nam); + error = in6_pcbbind(in6p, nam, l); splx(s); return error; } static int -udp6_listen(struct socket *so) +udp6_listen(struct socket *so, struct lwp *l) { KASSERT(solocked(so)); @@ -710,7 +710,7 @@ udp6_listen(struct socket *so) } static int -udp6_connect(struct socket *so, struct mbuf *nam) +udp6_connect(struct socket *so, struct mbuf *nam, struct lwp *l) { struct in6pcb *in6p = sotoin6pcb(so); int error = 0; @@ -722,7 +722,7 @@ udp6_connect(struct socket *so, struct mbuf *nam) if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_faddr)) return EISCONN; s = splsoftnet(); - error = in6_pcbconnect(in6p, nam, curlwp); + error = in6_pcbconnect(in6p, nam, l); splx(s); if (error == 0) soisconnected(so); |
