diff options
| author | glebius <glebius@FreeBSD.org> | 2013-11-14 09:19:50 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2013-11-14 09:19:50 +0000 |
| commit | 6e9011bd59a20b07230bd4fe50f79a2f20e23116 (patch) | |
| tree | 820d5a9464c3e4b43ee5fd57086d03129fbbf873 | |
| parent | 233591315f07c0bb620f209d3812b059d73c37e0 (diff) | |
| download | FreeBSD-src-6e9011bd59a20b07230bd4fe50f79a2f20e23116.zip FreeBSD-src-6e9011bd59a20b07230bd4fe50f79a2f20e23116.tar.gz | |
Merge r257841 from head:
Catch up with sb_timeo type change in r255138. This fixes
smbfs operation.
PR: kern/182963
Approved by: re (kib)
| -rw-r--r-- | sys/netsmb/smb_trantcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netsmb/smb_trantcp.c b/sys/netsmb/smb_trantcp.c index a22e064..ef9b52e 100644 --- a/sys/netsmb/smb_trantcp.c +++ b/sys/netsmb/smb_trantcp.c @@ -155,8 +155,8 @@ nb_connect_in(struct nbpcb *nbp, struct sockaddr_in *to, struct thread *td) SOCKBUF_LOCK(&so->so_rcv); soupcall_set(so, SO_RCV, nb_upcall, nbp); SOCKBUF_UNLOCK(&so->so_rcv); - so->so_rcv.sb_timeo = (5 * hz); - so->so_snd.sb_timeo = (5 * hz); + so->so_rcv.sb_timeo = (5 * SBT_1S); + so->so_snd.sb_timeo = (5 * SBT_1S); error = soreserve(so, nbp->nbp_sndbuf, nbp->nbp_rcvbuf); if (error) goto bad; |
