diff options
| author | brueffer <brueffer@FreeBSD.org> | 2012-07-10 21:02:59 +0000 |
|---|---|---|
| committer | brueffer <brueffer@FreeBSD.org> | 2012-07-10 21:02:59 +0000 |
| commit | 54ed21c8d6e0df837ed572d9b9a41d69fdee4e29 (patch) | |
| tree | d38c82f22959399bf37dc25d6d5c851c95f6a819 /sys/netsmb | |
| parent | b19509b9f382661b6604836db565fd7e0d9a94f3 (diff) | |
| download | FreeBSD-src-54ed21c8d6e0df837ed572d9b9a41d69fdee4e29.zip FreeBSD-src-54ed21c8d6e0df837ed572d9b9a41d69fdee4e29.tar.gz | |
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
Diffstat (limited to 'sys/netsmb')
| -rw-r--r-- | sys/netsmb/smb_trantcp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/netsmb/smb_trantcp.c b/sys/netsmb/smb_trantcp.c index c898451..ce52544 100644 --- a/sys/netsmb/smb_trantcp.c +++ b/sys/netsmb/smb_trantcp.c @@ -523,8 +523,10 @@ smb_nbst_connect(struct smb_vc *vcp, struct sockaddr *sap, struct thread *td) 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); |
