Date: Tue, 10 Jul 2012 21:03:00 +0000 (UTC) From: Christian Brueffer <brueffer@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r238356 - head/sys/netsmb Message-ID: <201207102103.q6AL3081003349@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brueffer Date: Tue Jul 10 21:02:59 2012 New Revision: 238356 URL: http://svn.freebsd.org/changeset/base/238356 Log: Change a duplicated check to clarify that we really want to set a reasonable default timeout. PR: 163135 Submitted by: Sascha Wildner <saw@online.de> Suggested by: bp Reviewed by: bp Modified: head/sys/netsmb/smb_trantcp.c Modified: head/sys/netsmb/smb_trantcp.c ============================================================================== --- head/sys/netsmb/smb_trantcp.c Tue Jul 10 20:59:35 2012 (r238355) +++ head/sys/netsmb/smb_trantcp.c Tue Jul 10 21:02:59 2012 (r238356) @@ -523,8 +523,10 @@ smb_nbst_connect(struct smb_vc *vcp, str return error; getnanotime(&ts2); timespecsub(&ts2, &ts1); - if (ts2.tv_sec == 0 && ts2.tv_sec == 0) + if (ts2.tv_sec == 0) { ts2.tv_sec = 1; + ts2.tv_nsec = 0; + } nbp->nbp_timo = ts2; timespecadd(&nbp->nbp_timo, &ts2); timespecadd(&nbp->nbp_timo, &ts2);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207102103.q6AL3081003349>