Module Name: src
Committed By: bouyer
Date: Mon May 11 20:02:44 UTC 2009
Modified Files:
src/sys/dist/ipf/netinet [netbsd-5]: ip_fil_netbsd.c
Log Message:
Pull up following revision(s) (requested by kefren in ticket #748):
sys/dist/ipf/netinet/ip_fil_netbsd.c: revision 1.50
Don't call callout_stop() without callout_init()
Fixes PR/41364
To generate a diff of this commit:
cvs rdiff -u -r1.46.8.1 -r1.46.8.2 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.46.8.1 src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.2
--- src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1 Thu Feb 19 20:33:39 2009
+++ src/sys/dist/ipf/netinet/ip_fil_netbsd.c Mon May 11 20:02:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.1 2009/02/19 20:33:39 snj Exp $ */
+/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.2 2009/05/11 20:02:43 bouyer 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.46.8.1 2009/02/19 20:33:39 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.46.8.2 2009/05/11 20:02:43 bouyer 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";
@@ -471,7 +471,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 */
