diff options
| author | mlaier <mlaier@FreeBSD.org> | 2005-09-27 18:10:43 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2005-09-27 18:10:43 +0000 |
| commit | a42af632d87879621ea936244e0eb8a934e9054c (patch) | |
| tree | 06d50385e76f077f148ab914f1e6e424fbea50a1 /sys/conf | |
| parent | ef35b51d9d50287690c02c0c566d37a0a97161db (diff) | |
| download | FreeBSD-src-a42af632d87879621ea936244e0eb8a934e9054c.zip FreeBSD-src-a42af632d87879621ea936244e0eb8a934e9054c.tar.gz | |
Remove bridge(4) from the tree. if_bridge(4) is a full functional
replacement and has additional features which make it superior.
Discussed on: -arch
Reviewed by: thompsa
X-MFC-after: never (RELENG_6 as transition period)
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/NOTES | 5 | ||||
| -rw-r--r-- | sys/conf/files | 1 | ||||
| -rw-r--r-- | sys/conf/options | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index ba0225b..157f61c 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -765,12 +765,7 @@ options TCP_DROP_SYNFIN #drop TCP packets with SYN+FIN # as well. See dummynet(4) and ipfw(8) for more info. When you run # DUMMYNET it is advisable to also have "options HZ=1000" to achieve a # smoother scheduling of the traffic. -# -# BRIDGE enables bridging between ethernet cards -- see bridge(4). -# You can use IPFIREWALL and DUMMYNET together with bridging. -# options DUMMYNET -options BRIDGE # Zero copy sockets support. This enables "zero copy" for sending and # receiving data via a socket. The send side works for any type of NIC, diff --git a/sys/conf/files b/sys/conf/files index 6e057cb..eae581a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1418,7 +1418,6 @@ libkern/strvalid.c standard net/bpf.c standard net/bpf_filter.c optional bpf net/bpf_filter.c optional netgraph_bpf -net/bridge.c optional bridge net/bridgestp.c optional if_bridge net/bsd_comp.c optional ppp_bsdcomp net/if.c standard diff --git a/sys/conf/options b/sys/conf/options index fdee8b5..b11aa09 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -327,7 +327,6 @@ BOOTP_COMPAT opt_bootp.h BOOTP_NFSROOT opt_bootp.h BOOTP_NFSV3 opt_bootp.h BOOTP_WIRED_TO opt_bootp.h -BRIDGE opt_bdg.h DEV_PF opt_pf.h DEV_PFLOG opt_pf.h DEV_PFSYNC opt_pf.h |
