From 508d06616fce6b1c10bbe2da75149660039a66cd Mon Sep 17 00:00:00 2001
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Mon, 14 Dec 1998 17:46:15 +0000
Subject: [PATCH] Bring dummynet+bridging in -current. Everything will be ready
 when LINT is updated.

---
 sys/conf/files   | 2 ++
 sys/conf/options | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys/conf/files b/sys/conf/files
index 1be5ecb91c3..28305468db9 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -333,6 +333,7 @@ msdosfs/msdosfs_vfsops.c	optional msdosfs
 msdosfs/msdosfs_vnops.c		optional msdosfs
 net/bpf.c		optional bpfilter
 net/bpf_filter.c	optional bpfilter
+net/bridge.c		optional bridge
 net/bsd_comp.c		optional ppp_bsdcomp
 #net/hostcache.c		standard
 net/if.c		standard
@@ -456,6 +457,7 @@ netinet/in_proto.c	optional inet
 netinet/in_rmx.c	optional inet
 netinet/ip_auth.c	optional ipfilter inet
 netinet/ip_divert.c	optional ipdivert
+netinet/ip_dummynet.c  optional dummynet
 netinet/ip_fil.c	optional ipfilter inet
 netinet/ip_flow.c	optional inet
 netinet/ip_frag.c	optional ipfilter inet
diff --git a/sys/conf/options b/sys/conf/options
index cb3b023fac4..9a4f27ab385 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.109 1998/11/26 23:13:11 n_hibma Exp $
+#	$Id: options,v 1.110 1998/12/05 03:19:48 dillon Exp $
 #
 #        On the handling of kernel options   
 # 
@@ -185,9 +185,11 @@ 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
 MROUTING		opt_mrouting.h
 INET			opt_inet.h
 IPDIVERT
+DUMMYNET		opt_ipdn.h
 IPFIREWALL		opt_ipfw.h
 IPFIREWALL_VERBOSE	opt_ipfw.h
 IPFIREWALL_VERBOSE_LIMIT	opt_ipfw.h