Module Name: src
Committed By: ahoka
Date: Tue Apr 13 01:02:43 UTC 2010
Modified Files:
src/sys/dist/pf/net: pf_ioctl.c
Log Message:
Do not auto unload pf if it's enabled.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/dist/pf/net/pf_ioctl.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/pf/net/pf_ioctl.c
diff -u src/sys/dist/pf/net/pf_ioctl.c:1.38 src/sys/dist/pf/net/pf_ioctl.c:1.39
--- src/sys/dist/pf/net/pf_ioctl.c:1.38 Mon Apr 12 13:57:38 2010
+++ src/sys/dist/pf/net/pf_ioctl.c Tue Apr 13 01:02:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pf_ioctl.c,v 1.38 2010/04/12 13:57:38 ahoka Exp $ */
+/* $NetBSD: pf_ioctl.c,v 1.39 2010/04/13 01:02:43 ahoka Exp $ */
/* $OpenBSD: pf_ioctl.c,v 1.182 2007/06/24 11:17:13 mcbride Exp $ */
/*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.38 2010/04/12 13:57:38 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.39 2010/04/13 01:02:43 ahoka Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -3367,6 +3367,13 @@
pfdetach();
pflogdetach();
return devsw_detach(NULL, &pf_cdevsw);
+ case MODULE_CMD_AUTOUNLOAD:
+ /* Do not auto unload pf if it's enabled. */
+ if (pf_status.running) {
+ return EBUSY;
+ } else {
+ return ENOTTY;
+ }
default:
return ENOTTY;
}
