d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Temporary disconnect i4bing, i4bisppp and i4bipr from the build for

Browse Source 
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)
This commit is contained in:
Bjoern A. Zeeb 2007-07-04 00:18:39 +00:00
parent 2966d28c32
commit 118043c6b1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=171196
11 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/conf/NOTES
View File

@ -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

6
sys/conf/files
View File

@ -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
#

6
sys/conf/options
View File

@ -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

4
sys/conf/options.amd64
View File

@ -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

4
sys/conf/options.i386
View File

@ -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

4
sys/conf/options.pc98
View File

@ -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

17
sys/i386/conf/NOTES
View File

@ -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

2
sys/i4b/driver/i4b_ing.c
View File

@ -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 */

2
sys/i4b/driver/i4b_ipr.c
View File

@ -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 */

2
sys/i4b/driver/i4b_isppp.c
View File

@ -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)

17
sys/pc98/conf/NOTES
View File

@ -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