From ccddbf936506740e6edc9eb571bc98fe440d0249 Mon Sep 17 00:00:00 2001 From: glebius Date: Mon, 29 Apr 2013 06:11:19 +0000 Subject: [PATCH] Remove useless ifdef KLD_MODULE from dummynet module unload path. This fixes panic on unload. Reported by: pho --- sys/netpfil/ipfw/ip_dummynet.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/netpfil/ipfw/ip_dummynet.c b/sys/netpfil/ipfw/ip_dummynet.c index 509aeb752966..1f25af59d0bd 100644 --- a/sys/netpfil/ipfw/ip_dummynet.c +++ b/sys/netpfil/ipfw/ip_dummynet.c @@ -2170,7 +2170,6 @@ ip_dn_init(void) getmicrouptime(&dn_cfg.prev_t); } -#ifdef KLD_MODULE static void ip_dn_destroy(int last) { @@ -2194,7 +2193,6 @@ ip_dn_destroy(int last) DN_LOCK_DESTROY(); } -#endif /* KLD_MODULE */ static int dummynet_modevent(module_t mod, int type, void *data) @@ -2210,13 +2208,8 @@ dummynet_modevent(module_t mod, int type, void *data) 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; }