Module Name: src
Committed By: ahoka
Date: Tue Apr 13 13:08:16 UTC 2010
Modified Files:
src/sys/dist/pf/net: pf_ioctl.c
Log Message:
Do not unload pf when enabled, not even manually.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 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.40 src/sys/dist/pf/net/pf_ioctl.c:1.41
--- src/sys/dist/pf/net/pf_ioctl.c:1.40 Tue Apr 13 11:53:18 2010
+++ src/sys/dist/pf/net/pf_ioctl.c Tue Apr 13 13:08:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pf_ioctl.c,v 1.40 2010/04/13 11:53:18 ahoka Exp $ */
+/* $NetBSD: pf_ioctl.c,v 1.41 2010/04/13 13:08:16 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.40 2010/04/13 11:53:18 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.41 2010/04/13 13:08:16 ahoka Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -3364,15 +3364,12 @@
pflogattach(1);
return 0;
case MODULE_CMD_FINI:
- 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;
+ pfdetach();
+ pflogdetach();
+ return devsw_detach(NULL, &pf_cdevsw);
}
default:
return ENOTTY;
