Temporary disconnect i4bing, i4bisppp and i4bipr from the build for

the 7.0 timeframe.

This is needed because I4B is not locked and NET_NEEDS_GIANT goes away.

The plan is to lock I4B and bring everything back for 7.1.

Approved by:	re (kensmith)

11 files changed, 36 insertions, 32 deletions

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 0fa1a70..5304bf9 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -542,9 +542,9 @@ options 	ELSA_QS1PCI
 #XXX#device	i4bipr
 #XXX#options 	NI4BIPR=4
 # enable VJ header compression detection for ipr i/f
-options 	IPR_VJ
+#XXX#options 	IPR_VJ
 # enable logging of the first n IP packets to isdnd (n=32 here)
-options 	IPR_LOG=32
+#XXX#options 	IPR_LOG=32
 #
 # network driver for sync PPP over ISDN; requires an equivalent
 # number of sppp device to be configured
diff --git a/sys/conf/files b/sys/conf/files
index d8a4f42..d89866b 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1309,11 +1309,11 @@ gnu/fs/reiserfs/reiserfs_vnops.c	optional reiserfs
 i4b/driver/i4b_trace.c		optional i4btrc
 i4b/driver/i4b_rbch.c		optional i4brbch
 i4b/driver/i4b_tel.c		optional i4btel
-i4b/driver/i4b_ipr.c		optional i4bipr
+#XXXBZ#i4b/driver/i4b_ipr.c		optional i4bipr
 net/slcompress.c		optional i4bipr | i4bisppp
 i4b/driver/i4b_ctl.c		optional i4bctl
-i4b/driver/i4b_ing.c		optional i4bing
-i4b/driver/i4b_isppp.c		optional i4bisppp
+#XXXBZ#i4b/driver/i4b_ing.c		optional i4bing
+#XXXBZ#i4b/driver/i4b_isppp.c		optional i4bisppp
 #
 # isdn4bsd CAPI driver
 #
diff --git a/sys/conf/options b/sys/conf/options
index 789b3b6..d08a5d6 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -731,9 +731,9 @@ DCONS_FORCE_GDB		opt_dcons.h
 NI4BTRC			opt_i4b.h
 NI4BRBCH		opt_i4b.h
 NI4BTEL			opt_i4b.h
-NI4BIPR			opt_i4b.h
-NI4BING			opt_i4b.h
-NI4BISPPP		opt_i4b.h
+#XXXBZ#NI4BIPR			opt_i4b.h
+#XXXBZ#NI4BING			opt_i4b.h
+#XXXBZ#NI4BISPPP		opt_i4b.h
 
 # VFS options
 LOOKUP_SHARED		opt_vfs.h
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index 7d29710..79bc816 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -50,8 +50,8 @@ ELSA_QS1PCI		opt_i4b.h
 # temporary workaround for SMP machines
 I4B_SMP_WORKAROUND	opt_i4b.h
 # enable VJ compression code for ipr i/f
-IPR_VJ			opt_i4b.h
-IPR_LOG			opt_i4b.h
+#XXXBZ#IPR_VJ			opt_i4b.h
+#XXXBZ#IPR_LOG			opt_i4b.h
 
 # -------------------------------
 # EOF
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 60a9542..2325fd9 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -136,8 +136,8 @@ ELSA_QS1PCI		opt_i4b.h
 # temporary workaround for SMP machines
 I4B_SMP_WORKAROUND	opt_i4b.h
 # enable VJ compression code for ipr i/f
-IPR_VJ			opt_i4b.h
-IPR_LOG			opt_i4b.h
+#XXXBZ#IPR_VJ			opt_i4b.h
+#XXXBZ#IPR_LOG			opt_i4b.h
 
 # Device options
 DEV_APIC		opt_apic.h
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index c3bc07f..605870a 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -89,8 +89,8 @@ ELSA_QS1PCI		opt_i4b.h
 # temporary workaround for SMP machines
 I4B_SMP_WORKAROUND	opt_i4b.h
 # enable VJ compression code for ipr i/f
-IPR_VJ			opt_i4b.h
-IPR_LOG			opt_i4b.h
+#XXXBZ#IPR_VJ			opt_i4b.h
+#XXXBZ#IPR_LOG			opt_i4b.h
 
 # ct driver options
 CT_BUS_WEIGHT		opt_ct.h
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 2e7c181..bbbea1a 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1059,22 +1059,23 @@ options 	NI4BRBCH=4
 device		i4btel
 options 	NI4BTEL=2
 #
+#XXXBZ# IPR and ISPPP are not usable until I4B is locked.
 # network driver for IP over raw HDLC ISDN
-device		i4bipr
-options 	NI4BIPR=4
+#XXXBZ#device		i4bipr
+#XXXBZ#options 	NI4BIPR=4
 # enable VJ header compression detection for ipr i/f
-options 	IPR_VJ
+#XXXBZ#options 	IPR_VJ
 # enable logging of the first n IP packets to isdnd (n=32 here)
-options 	IPR_LOG=32
+#XXXBZ#options 	IPR_LOG=32
 #
 # network driver for sync PPP over ISDN; requires an equivalent
 # number of sppp device to be configured
-device		i4bisppp
-options 	NI4BISPPP=4
+#XXXBZ#device		i4bisppp
+#XXXBZ#options 	NI4BISPPP=4
 #
 # B-channel interface to the netgraph subsystem
-device		i4bing
-options 	NI4BING=2
+#XXXBZ#device		i4bing
+#XXXBZ#options 	NI4BING=2
 #
 # CAPI driver needed for active ISDN cards (see iavc driver above)
 device		i4bcapi
diff --git a/sys/i4b/driver/i4b_ing.c b/sys/i4b/driver/i4b_ing.c
index a61e1e8..5dda622 100644
--- a/sys/i4b/driver/i4b_ing.c
+++ b/sys/i4b/driver/i4b_ing.c
@@ -58,6 +58,8 @@ __FBSDID("$FreeBSD$");
 
 #include <i4b/layer4/i4b_l4.h>
 
+#error "Cannot be used until I4B is locked."
+
 #define I4BINGACCT	1		/* enable accounting messages */
 #define	I4BINGACCTINTVL	2		/* accounting msg interval in secs */
 
diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index 0d90b8a..a6ac95f 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -106,7 +106,7 @@ __FBSDID("$FreeBSD$");
 
 #include <i4b/layer4/i4b_l4.h>
 
-NET_NEEDS_GIANT("i4b_ipr");
+#error "Cannot be used until I4B is locked."
 
 #define I4BIPRMTU	1500		/* regular MTU */
 #define I4BIPRMAXMTU	2000		/* max MTU */
diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c
index 2d9abe8..2001b88 100644
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$");
 
 #include <i4b/layer4/i4b_l4.h>
 
-NET_NEEDS_GIANT("i4b_isppp");
+#error "Cannot be used until I4B is locked."
 
 #define ISPPP_FMT	"isp%d: "
 #define	ISPPP_ARG(sc)	(sc->sc_ifp->if_dunit)
diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES
index 17aceef..09a2073 100644
--- a/sys/pc98/conf/NOTES
+++ b/sys/pc98/conf/NOTES
@@ -627,22 +627,23 @@ options 	NI4BRBCH=4
 device		i4btel
 options 	NI4BTEL=2
 #
+#XXXBZ# IPR and ISPPP are not usable until I4B is locked.
 # network driver for IP over raw HDLC ISDN
-device		i4bipr
-options 	NI4BIPR=4
+#XXXBZ#device		i4bipr
+#XXXBZ#options 	NI4BIPR=4
 # enable VJ header compression detection for ipr i/f
-options 	IPR_VJ
+#XXXBZ#options 	IPR_VJ
 # enable logging of the first n IP packets to isdnd (n=32 here)
-options 	IPR_LOG=32
+#XXXBZ#options 	IPR_LOG=32
 #
 # network driver for sync PPP over ISDN; requires an equivalent
 # number of sppp device to be configured
-device		i4bisppp
-options 	NI4BISPPP=4
+#XXXBZ#device		i4bisppp
+#XXXBZ#options 	NI4BISPPP=4
 #
 # B-channel interface to the netgraph subsystem
-device		i4bing
-options 	NI4BING=2
+#XXXBZ#device		i4bing
+#XXXBZ#options 	NI4BING=2
 #
 # CAPI driver needed for active ISDN cards (see iavc driver above)
 device		i4bcapi