svn commit: r238356 - head/sys/netsmb
Christian Brueffer
brueffer at FreeBSD.org
Tue Jul 10 21:03:00 UTC 2012
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 at 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);
More information about the svn-src-head
mailing list