[src/trunk]: src/sys/dist/pf/net Do not unload pf when enabled, not even manu...

[ahoka <ahoka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6e96bbe31c65
branches:  trunk
changeset: 753903:6e96bbe31c65
user:      ahoka <ahoka%NetBSD.org@localhost>
date:      Tue Apr 13 13:08:16 2010 +0000

description:
Do not unload pf when enabled, not even manually.

diffstat:

 sys/dist/pf/net/pf_ioctl.c |  13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diffs (37 lines):

diff -r 9c9d3b400b5a -r 6e96bbe31c65 sys/dist/pf/net/pf_ioctl.c
--- a/sys/dist/pf/net/pf_ioctl.c        Tue Apr 13 12:04:25 2010 +0000
+++ b/sys/dist/pf/net/pf_ioctl.c        Tue Apr 13 13:08:16 2010 +0000
@@ -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;