Refuse to unload the ipdivert module unless the 'force' flag is given to kldunload.

Reflect the fact that IPDIVERT is a loadable module in the divert(4) and ipfw(8)
man pages.

1 files changed, 11 insertions, 1 deletions

diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index d3efde0..7be0e35 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -688,8 +688,18 @@ div_modevent(module_t mod, int type, void *unused)
 		err = pf_proto_register(PF_INET, &div_protosw);
 		ip_divert_ptr = divert_packet;
 		break;
+	case MOD_QUIESCE:
+		/*
+		 * IPDIVERT may normally not be unloaded because of the
+		 * potential race conditions.  Tell kldunload we can't be
+		 * unloaded unless the unload is forced.
+		 */
+		err = EPERM;
+		break;
 	case MOD_UNLOAD:
 		/*
+		 * Forced unload.
+		 *
 		 * Module ipdivert can only be unloaded if no sockets are
 		 * connected.  Maybe this can be changed later to forcefully
 		 * disconnect any open sockets.
@@ -712,7 +722,7 @@ div_modevent(module_t mod, int type, void *unused)
 		uma_zdestroy(divcbinfo.ipi_zone);
 		break;
 	default:
-		return EINVAL;
+		err = EOPNOTSUPP;
 		break;
 	}
 	return err;