aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1999-04-26 09:00:47 +0000
committerPeter Wemm <peter@FreeBSD.org>1999-04-26 09:00:47 +0000
commit61a6c2e81d1fa67d66d0c85a01a02d2f40c43b3e (patch)
tree1de42a21dd532e3680bed7438cb530c0835dd65a
parent10cd8cf48b533ea7d359b31558da079b3ca4ca29 (diff)
Notes
-rw-r--r--sys/net/bridge.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/net/bridge.c b/sys/net/bridge.c
index ecb9a999c94b..f7bc63eb79dd 100644
--- a/sys/net/bridge.c
+++ b/sys/net/bridge.c
@@ -127,7 +127,7 @@
static void bdginit(void *);
static void flush_table(void);
-SYSINIT(interfaces, SI_SUB_PROTO_IF, SI_ORDER_FIRST, bdginit, NULL)
+SYSINIT(interfaces, SI_SUB_PROTO_IF, SI_ORDER_SECOND, bdginit, NULL)
static int bdg_ipfw = 0 ;
int do_bridge = 0;
@@ -282,18 +282,22 @@ int bdg_ports ;
/*
* initialization of bridge code.
+ *
+ * This will have to change to support kldload.
*/
static void
bdginit(dummy)
void *dummy;
{
- int i ;
+ int i, s;
struct ifnet *ifp;
struct arpcom *ac ;
u_char *eth_addr ;
+
/*
* initialization of bridge code
*/
+ s = splimp(); /* XXX does this matter? */
if (bdg_table == NULL)
bdg_table = (struct hash_table *)
malloc(HASH_SIZE * sizeof(struct hash_table),
@@ -332,6 +336,7 @@ bdginit(dummy)
}
bdg_timeout(0);
do_bridge=0;
+ splx(s);
}
/*