Module Name: src
Committed By: njoly
Date: Wed Jul 1 10:01:28 UTC 2009
Modified Files:
src/sys/netsmb: smb_iod.c
Log Message:
Do not call callout_stop() unless the structure was previoulsy
initialised for a non null timeout.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/netsmb/smb_iod.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netsmb/smb_iod.c
diff -u src/sys/netsmb/smb_iod.c:1.30 src/sys/netsmb/smb_iod.c:1.31
--- src/sys/netsmb/smb_iod.c:1.30 Wed Mar 18 15:14:32 2009
+++ src/sys/netsmb/smb_iod.c Wed Jul 1 10:01:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_iod.c,v 1.30 2009/03/18 15:14:32 cegger Exp $ */
+/* $NetBSD: smb_iod.c,v 1.31 2009/07/01 10:01:28 njoly Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smb_iod.c,v 1.30 2009/03/18 15:14:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_iod.c,v 1.31 2009/07/01 10:01:28 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,7 +78,8 @@
rqp->sr_rpgen++;
rqp->sr_state = SMBRQ_NOTIFIED;
wakeup(&rqp->sr_state);
- callout_stop(&rqp->sr_timo_ch);
+ if (rqp->sr_timo > 0)
+ callout_stop(&rqp->sr_timo_ch);
if (rqp->sr_recvcallback)
(*rqp->sr_recvcallback)(rqp->sr_recvarg);
SMBRQ_SUNLOCK(rqp);
