diff options
| author | wkoszek <wkoszek@FreeBSD.org> | 2006-02-27 16:56:22 +0000 |
|---|---|---|
| committer | wkoszek <wkoszek@FreeBSD.org> | 2006-02-27 16:56:22 +0000 |
| commit | 296928cec1bbec980dbc12f6b56a3419651cc819 (patch) | |
| tree | 90c53c0ea97b80896810305acd80ed5c26b81d77 /sys/net | |
| parent | 3ad16c4a5f6685c188056cbd45faf762e1e6819e (diff) | |
| download | FreeBSD-src-296928cec1bbec980dbc12f6b56a3419651cc819.zip FreeBSD-src-296928cec1bbec980dbc12f6b56a3419651cc819.tar.gz | |
This patch fixes a problem, which exists if you have IPSEC in your kernel
and want to have crypto support loaded as KLD. By moving zlib to separate
module and adding MODULE_DEPEND directives, it is possible to use such
configuration without complication. Otherwise, since IPSEC is linked with
zlib (just like crypto.ko) you'll get following error:
interface zlib.1 already present in the KLD 'kernel'!
Approved by: cognet (mentor)
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/ppp_deflate.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/net/ppp_deflate.c b/sys/net/ppp_deflate.c index 6a49363..0bf0c49 100644 --- a/sys/net/ppp_deflate.c +++ b/sys/net/ppp_deflate.c @@ -34,6 +34,7 @@ #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> +#include <sys/module.h> #include <sys/mutex.h> #include <net/ppp_defs.h> @@ -676,3 +677,4 @@ z_incomp(arg, mi) state->stats.unc_bytes += rlen; state->stats.unc_packets++; } +MODULE_DEPEND(ppp_deflate, zlib, 1, 1, 1); |
