Module Name: src Committed By: kefren Date: Fri May 8 05:18:34 UTC 2009
Modified Files: src/sys/dist/ipf/netinet: ip_fil_netbsd.c Log Message: Don't call callout_stop() without callout_init() Fixes PR/41364 To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/dist/ipf/netinet/ip_fil_netbsd.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/dist/ipf/netinet/ip_fil_netbsd.c diff -u src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.49 src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.50 --- src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.49 Sun Apr 19 18:08:56 2009 +++ src/sys/dist/ipf/netinet/ip_fil_netbsd.c Fri May 8 05:18:34 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_fil_netbsd.c,v 1.49 2009/04/19 18:08:56 tsutsui Exp $ */ +/* $NetBSD: ip_fil_netbsd.c,v 1.50 2009/05/08 05:18:34 kefren Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -8,7 +8,7 @@ #if !defined(lint) #if defined(__NetBSD__) #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.49 2009/04/19 18:08:56 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.50 2009/05/08 05:18:34 kefren Exp $"); #else static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 2.55.2.59 2008/03/01 23:16:38 darrenr Exp"; @@ -485,7 +485,8 @@ SPL_NET(s); #if (__NetBSD_Version__ >= 104010000) - callout_stop(&fr_slowtimer_ch); + if (fr_running > 0) + callout_stop(&fr_slowtimer_ch); #else untimeout(fr_slowtimer, NULL); #endif /* NetBSD */