Date: Thu, 14 Nov 2013 09:19:50 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r258123 - stable/10/sys/netsmb Message-ID: <201311140919.rAE9Jok2040988@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Thu Nov 14 09:19:50 2013 New Revision: 258123 URL: http://svnweb.freebsd.org/changeset/base/258123 Log: Merge r257841 from head: Catch up with sb_timeo type change in r255138. This fixes smbfs operation. PR: kern/182963 Approved by: re (kib) Modified: stable/10/sys/netsmb/smb_trantcp.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/netsmb/smb_trantcp.c ============================================================================== --- stable/10/sys/netsmb/smb_trantcp.c Thu Nov 14 09:17:27 2013 (r258122) +++ stable/10/sys/netsmb/smb_trantcp.c Thu Nov 14 09:19:50 2013 (r258123) @@ -155,8 +155,8 @@ nb_connect_in(struct nbpcb *nbp, struct 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311140919.rAE9Jok2040988>