summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2008-05-25 22:11:40 +0000
committerrwatson <rwatson@FreeBSD.org>2008-05-25 22:11:40 +0000
commita3623cb733d4a3ddcf8ba280724b8ce3f19a7a58 (patch)
treeafe56b8f23cfc7884850445d064a110b6ac85c9e /sys/conf
parent2f956b205ca6c855f85983809448ddc387407d46 (diff)
downloadFreeBSD-src-a3623cb733d4a3ddcf8ba280724b8ce3f19a7a58.zip
FreeBSD-src-a3623cb733d4a3ddcf8ba280724b8ce3f19a7a58.tar.gz
Remove netatm from HEAD as it is not MPSAFE and relies on the now removed
NET_NEEDS_GIANT. netatm has been disconnected from the build for ten months in HEAD/RELENG_7. Specifics: - netatm include files - netatm command line management tools - libatm - ATM parts in rescue and sysinstall - sample configuration files and documents - kernel support as a module or in NOTES - netgraph wrapper nodes for netatm - ctags data for netatm. - netatm-specific device drivers. MFC after: 3 weeks Reviewed by: bz Discussed with: bms, bz, harti
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/NOTES32
-rw-r--r--sys/conf/files103
-rw-r--r--sys/conf/options7
3 files changed, 0 insertions, 142 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 45d7e03..addd67f 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -910,38 +910,6 @@ options DUMMYNET
# zero_copy(9) for more details.
options ZERO_COPY_SOCKETS
-#
-# ATM (HARP version) options
-#
-# XXX: These have been disabled in FreeBSD 7.0 as they are not MPSAFE.
-#
-# ATM_CORE includes the base ATM functionality code. This must be included
-# for ATM support.
-#
-# ATM_IP includes support for running IP over ATM.
-#
-# At least one (and usually only one) of the following signalling managers
-# must be included (note that all signalling managers include PVC support):
-# ATM_SIGPVC includes support for the PVC-only signalling manager `sigpvc'.
-# ATM_SPANS includes support for the `spans' signalling manager, which runs
-# the FORE Systems's proprietary SPANS signalling protocol.
-# ATM_UNI includes support for the `uni30' and `uni31' signalling managers,
-# which run the ATM Forum UNI 3.x signalling protocols.
-#
-# The `hfa' driver provides support for the FORE Systems, Inc.
-# PCA-200E ATM PCI Adapter.
-#
-# The `harp' pseudo-driver makes all NATM interface drivers available to HARP.
-#
-#options ATM_CORE #core ATM protocol family
-#options ATM_IP #IP over ATM support
-#options ATM_SIGPVC #SIGPVC signalling manager
-#options ATM_SPANS #SPANS signalling manager
-#options ATM_UNI #UNI signalling manager
-
-#device hfa #FORE PCA-200E ATM PCI
-#device harp #Pseudo-interface for NATM
-
#####################################################################
# FILESYSTEM OPTIONS
diff --git a/sys/conf/files b/sys/conf/files
index 009ef50..4b9afc7 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -667,28 +667,11 @@ dev/flash/at45d.c optional at45d
dev/fxp/if_fxp.c optional fxp
dev/gem/if_gem.c optional gem
dev/gem/if_gem_pci.c optional gem pci
-#dev/harp/if_harp.c optional harp pci
dev/hatm/if_hatm.c optional hatm pci
dev/hatm/if_hatm_intr.c optional hatm pci
dev/hatm/if_hatm_ioctl.c optional hatm pci
dev/hatm/if_hatm_rx.c optional hatm pci
dev/hatm/if_hatm_tx.c optional hatm pci
-#dev/hfa/fore_buffer.c optional hfa
-#dev/hfa/fore_command.c optional hfa
-#dev/hfa/fore_globals.c optional hfa
-#dev/hfa/fore_if.c optional hfa
-#dev/hfa/fore_init.c optional hfa
-#dev/hfa/fore_intr.c optional hfa
-#dev/hfa/fore_output.c optional hfa
-#dev/hfa/fore_receive.c optional hfa
-#dev/hfa/fore_stats.c optional hfa
-#dev/hfa/fore_timer.c optional hfa
-#dev/hfa/fore_transmit.c optional hfa
-#dev/hfa/fore_vcm.c optional hfa
-##dev/hfa/hfa_eisa.c optional hfa eisa
-#dev/hfa/hfa_freebsd.c optional hfa
-#dev/hfa/hfa_pci.c optional hfa pci
-##dev/hfa/hfa_sbus.c optional hfa sbus
dev/hifn/hifn7751.c optional hifn
dev/hme/if_hme.c optional hme
dev/hme/if_hme_pci.c optional hme pci
@@ -1891,92 +1874,6 @@ netatalk/ddp_input.c optional netatalk
netatalk/ddp_output.c optional netatalk
netatalk/ddp_pcb.c optional netatalk
netatalk/ddp_usrreq.c optional netatalk
-#
-# netatm has been disconnected from the build until it is MPSAFE, or
-# alternatively, until it is removed.
-#
-#netatm/atm_aal5.c optional atm_core
-#netatm/atm_cm.c optional atm_core
-#netatm/atm_device.c optional atm_core
-#netatm/atm_if.c optional atm_core
-#netatm/atm_proto.c optional atm_core
-#netatm/atm_signal.c optional atm_core
-#netatm/atm_socket.c optional atm_core
-#netatm/atm_subr.c optional atm_core
-#netatm/atm_usrreq.c optional atm_core
-#netatm/ipatm/ipatm_event.c optional atm_ip atm_core
-#netatm/ipatm/ipatm_if.c optional atm_ip atm_core
-#netatm/ipatm/ipatm_input.c optional atm_ip atm_core
-#netatm/ipatm/ipatm_load.c optional atm_ip atm_core
-#netatm/ipatm/ipatm_output.c optional atm_ip atm_core
-#netatm/ipatm/ipatm_usrreq.c optional atm_ip atm_core
-#netatm/ipatm/ipatm_vcm.c optional atm_ip atm_core
-#netatm/sigpvc/sigpvc_if.c optional atm_sigpvc atm_core
-#netatm/sigpvc/sigpvc_subr.c optional atm_sigpvc atm_core
-#netatm/spans/spans_arp.c optional atm_spans atm_core \
-# dependency "spans_xdr.h"
-#netatm/spans/spans_cls.c optional atm_spans atm_core
-#netatm/spans/spans_if.c optional atm_spans atm_core
-#netatm/spans/spans_kxdr.c optional atm_spans atm_core
-#netatm/spans/spans_msg.c optional atm_spans atm_core
-#netatm/spans/spans_print.c optional atm_spans atm_core
-#netatm/spans/spans_proto.c optional atm_spans atm_core
-#netatm/spans/spans_subr.c optional atm_spans atm_core
-#netatm/spans/spans_util.c optional atm_spans atm_core
-#spans_xdr.h optional atm_spans atm_core \
-# before-depend \
-# dependency "$S/netatm/spans/spans_xdr.x" \
-# compile-with "rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \
-# clean "spans_xdr.h" \
-# no-obj no-implicit-rule
-#spans_xdr.c optional atm_spans atm_core \
-# before-depend \
-# dependency "$S/netatm/spans/spans_xdr.x" \
-# compile-with "rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \
-# clean "spans_xdr.c" \
-# no-obj no-implicit-rule local
-#spans_xdr.o optional atm_spans atm_core \
-# dependency "$S/netatm/spans/spans_xdr.x" \
-# compile-with "${NORMAL_C}" \
-# no-implicit-rule local
-#netatm/uni/q2110_sigaa.c optional atm_uni atm_core
-#netatm/uni/q2110_sigcpcs.c optional atm_uni atm_core
-#netatm/uni/q2110_subr.c optional atm_uni atm_core
-#netatm/uni/qsaal1_sigaa.c optional atm_uni atm_core
-#netatm/uni/qsaal1_sigcpcs.c optional atm_uni atm_core
-#netatm/uni/qsaal1_subr.c optional atm_uni atm_core
-#netatm/uni/sscf_uni.c optional atm_uni atm_core
-#netatm/uni/sscf_uni_lower.c optional atm_uni atm_core
-#netatm/uni/sscf_uni_upper.c optional atm_uni atm_core
-#netatm/uni/sscop.c optional atm_uni atm_core
-#netatm/uni/sscop_lower.c optional atm_uni atm_core
-#netatm/uni/sscop_pdu.c optional atm_uni atm_core
-#netatm/uni/sscop_sigaa.c optional atm_uni atm_core
-#netatm/uni/sscop_sigcpcs.c optional atm_uni atm_core
-#netatm/uni/sscop_subr.c optional atm_uni atm_core
-#netatm/uni/sscop_timer.c optional atm_uni atm_core
-#netatm/uni/sscop_upper.c optional atm_uni atm_core
-#netatm/uni/uni_load.c optional atm_uni atm_core
-#netatm/uni/uniarp.c optional atm_uni atm_core
-#netatm/uni/uniarp_cache.c optional atm_uni atm_core
-#netatm/uni/uniarp_input.c optional atm_uni atm_core
-#netatm/uni/uniarp_output.c optional atm_uni atm_core
-#netatm/uni/uniarp_timer.c optional atm_uni atm_core
-#netatm/uni/uniarp_vcm.c optional atm_uni atm_core
-#netatm/uni/uniip.c optional atm_uni atm_core
-#netatm/uni/unisig_decode.c optional atm_uni atm_core
-#netatm/uni/unisig_encode.c optional atm_uni atm_core
-#netatm/uni/unisig_if.c optional atm_uni atm_core
-#netatm/uni/unisig_mbuf.c optional atm_uni atm_core
-#netatm/uni/unisig_msg.c optional atm_uni atm_core
-#netatm/uni/unisig_print.c optional atm_uni atm_core
-#netatm/uni/unisig_proto.c optional atm_uni atm_core
-#netatm/uni/unisig_sigmgr_state.c optional atm_uni atm_core
-#netatm/uni/unisig_subr.c optional atm_uni atm_core
-#netatm/uni/unisig_util.c optional atm_uni atm_core
-#netatm/uni/unisig_vc_state.c optional atm_uni atm_core
-#netgraph/atm/atmpif/ng_atmpif.c optional netgraph_atm_atmpif
-#netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif
netgraph/atm/ccatm/ng_ccatm.c optional ngatm_ccatm \
compile-with "${NORMAL_C} -I$S/contrib/ngatm"
netgraph/atm/ng_atm.c optional ngatm_atm
diff --git a/sys/conf/options b/sys/conf/options
index 875e71b..8be2ed7 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -497,13 +497,6 @@ ZERO_COPY_SOCKETS opt_zero.h
TI_PRIVATE_JUMBOS opt_ti.h
TI_JUMBO_HDRSPLIT opt_ti.h
-# ATM (HARP version) - disabled as not MPSAFE in 7.0
-#ATM_CORE opt_atm.h
-#ATM_IP opt_atm.h
-#ATM_SIGPVC opt_atm.h
-#ATM_SPANS opt_atm.h
-#ATM_UNI opt_atm.h
-
# XXX Conflict: # of devices vs network protocol (Native ATM).
# This makes "atm.h" unusable.
NATM
OpenPOWER on IntegriCloud