svn commit: r252159 - stable/9/sys/netpfil/ipfw

[Gleb Smirnoff]

Author: glebius
Date: Mon Jun 24 09:57:41 2013
New Revision: 252159
URL: http://svnweb.freebsd.org/changeset/base/252159

Log:
  Merge r250039:
    Remove useless ifdef KLD_MODULE from dummynet module unload path. This
    fixes panic on unload.
  
    Reported by:  pho

Modified:
  stable/9/sys/netpfil/ipfw/ip_dummynet.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netpfil/ipfw/ip_dummynet.c
==============================================================================
--- stable/9/sys/netpfil/ipfw/ip_dummynet.c	Mon Jun 24 09:55:37 2013	(r252158)
+++ stable/9/sys/netpfil/ipfw/ip_dummynet.c	Mon Jun 24 09:57:41 2013	(r252159)
@@ -2169,7 +2169,6 @@ ip_dn_init(void)
 	getmicrouptime(&dn_cfg.prev_t);
 }
 
-#ifdef KLD_MODULE
 static void
 ip_dn_destroy(int last)
 {
@@ -2193,7 +2192,6 @@ ip_dn_destroy(int last)
 
 	DN_LOCK_DESTROY();
 }
-#endif /* KLD_MODULE */
 
 static int
 dummynet_modevent(module_t mod, int type, void *data)
@@ -2209,13 +2207,8 @@ dummynet_modevent(module_t mod, int type
 		ip_dn_io_ptr = dummynet_io;
 		return 0;
 	} else if (type == MOD_UNLOAD) {
-#if !defined(KLD_MODULE)
-		printf("dummynet statically compiled, cannot unload\n");
-		return EINVAL ;
-#else
 		ip_dn_destroy(1 /* last */);
 		return 0;
-#endif
 	} else
 		return EOPNOTSUPP;
 }