cvs commit: src/sys/modules Makefile src/sys/modules/crypto Makefile src/sys/modules/if_ppp Makefile src/sys/net ppp_deflate.c src/sys/opencrypto cryptodev.c

[Wojciech A. Koszek]

wkoszek     2006-03-01 21:40:14 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/modules          Makefile 
    sys/modules/crypto   Makefile 
    sys/modules/if_ppp   Makefile 
    sys/net              ppp_deflate.c 
    sys/opencrypto       cryptodev.c 
  Log:
  MFC:
    Connect zlib to the build.
  
    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)
  
  Approved by:    re (scottl)
  
  Revision    Changes    Path
  1.450.2.10  +2 -1      src/sys/modules/Makefile
  1.3.2.1     +0 -2      src/sys/modules/crypto/Makefile
  1.33.2.2    +1 -1      src/sys/modules/if_ppp/Makefile
  1.21.2.1    +2 -0      src/sys/net/ppp_deflate.c
  1.25.2.2    +1 -0      src/sys/opencrypto/cryptodev.c