From 10d645b7e5a073fc2d4c2bd7472966b4381caf7c Mon Sep 17 00:00:00 2001
From: Yaroslav Tykhiy <ytykhiy@gmail.com>
Date: Fri, 14 Oct 2005 23:17:45 +0000
Subject: [PATCH] In preparation for making the modules actually use opt_*.h
 files provided in the kernel build directory, fix modules that were failing
 to build this way due to not quite correct kernel option usage.  In
 particular:

ng_mppc.c uses two complementary options, both of which are listed
in sys/conf/files.  Ideally, there should be a separate option for
including ng_mppc.c in kernel build, but now only
NETGRAPH_MPPC_ENCRYPTION is usable anyway, the other one requires
proprietary files.

nwfs and smbfs were trying to ensure they were built with proper
network components, but the check was rather questionable.

Discussed with:	ru
---
 sys/fs/nwfs/nwfs_vfsops.c   | 4 ----
 sys/fs/smbfs/smbfs_vfsops.c | 4 ----
 sys/netgraph/ng_mppc.c      | 6 ++++++
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/sys/fs/nwfs/nwfs_vfsops.c b/sys/fs/nwfs/nwfs_vfsops.c
index 2f0ba1fc93c..4a10c2e3ba8 100644
--- a/sys/fs/nwfs/nwfs_vfsops.c
+++ b/sys/fs/nwfs/nwfs_vfsops.c
@@ -31,10 +31,6 @@
  *
  * $FreeBSD$
  */
-#include "opt_ncp.h"
-#ifndef NCP
-#error "NWFS requires NCP protocol"
-#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c
index b774443cbdb..5c093c17530 100644
--- a/sys/fs/smbfs/smbfs_vfsops.c
+++ b/sys/fs/smbfs/smbfs_vfsops.c
@@ -31,10 +31,6 @@
  *
  * $FreeBSD$
  */
-#include "opt_netsmb.h"
-#ifndef NETSMB
-#error "SMBFS requires option NETSMB"
-#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/ng_mppc.c b/sys/netgraph/ng_mppc.c
index a6a7a971f6e..55b021a6b56 100644
--- a/sys/netgraph/ng_mppc.c
+++ b/sys/netgraph/ng_mppc.c
@@ -63,8 +63,14 @@
 #include "opt_netgraph.h"
 
 #if !defined(NETGRAPH_MPPC_COMPRESSION) && !defined(NETGRAPH_MPPC_ENCRYPTION)
+#ifdef KLD_MODULE
+/* XXX NETGRAPH_MPPC_COMPRESSION isn't functional yet */
+#define NETGRAPH_MPPC_ENCRYPTION
+#else
+/* This case is indicative of an error in sys/conf files */
 #error Need either NETGRAPH_MPPC_COMPRESSION or NETGRAPH_MPPC_ENCRYPTION
 #endif
+#endif
 
 #ifdef NG_SEPARATE_MALLOC
 MALLOC_DEFINE(M_NETGRAPH_MPPC, "netgraph_mppc", "netgraph mppc node ");