diff options
| author | Jonathan Lemon <jlemon@FreeBSD.org> | 2000-11-26 21:59:30 +0000 |
|---|---|---|
| committer | Jonathan Lemon <jlemon@FreeBSD.org> | 2000-11-26 21:59:30 +0000 |
| commit | fe96e26dd08cb72b2624de8ea38d5e18ea113724 (patch) | |
| tree | db066e311bb086bde626f25f73039221f645ba8b | |
| parent | 9ba20c3119826bd3c081a83f174e6012174470e9 (diff) | |
Notes
| -rw-r--r-- | sys/modules/netgraph/Makefile | 4 | ||||
| -rw-r--r-- | sys/netgraph/ng_bridge.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile index 00babc784848..c47386c9ce79 100644 --- a/sys/modules/netgraph/Makefile +++ b/sys/modules/netgraph/Makefile @@ -1,11 +1,9 @@ # $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $ # $FreeBSD$ -SUBDIR= async bpf cisco echo ether frame_relay hole iface ksocket lmi \ +SUBDIR= async bpf bridge cisco echo ether frame_relay hole iface ksocket lmi \ netgraph one2many ppp pppoe pptpgre rfc1490 socket tee tty UI vjc -BROKENDIR= bridge - .if !defined(NOCRYPT) && exists(${.CURDIR}/../../crypto/rc4/rc4.c) SUBDIR+= mppc .endif diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c index 4c27798f6d4e..e33d7435306c 100644 --- a/sys/netgraph/ng_bridge.c +++ b/sys/netgraph/ng_bridge.c @@ -302,7 +302,7 @@ ng_bridge_constructor(node_p *nodep) MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); - callout_init(&priv->timer); + callout_init(&priv->timer, 0); /* Allocate and initialize hash table, etc. */ MALLOC(priv->tab, struct ng_bridge_bucket *, |