diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-12-17 23:44:30 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-12-17 23:44:30 +0000 |
| commit | da6809bfe334b33e9c52f3183576bd1f90f77b6f (patch) | |
| tree | a42f2e4ef8c566bd8e0a9a0e17779bc67ecd6700 /sys/net | |
| parent | 09d301bf2eb4c0c394047e710f8ee6ea3d540640 (diff) | |
revert last commit as it introduced system panics due to improper use
of bpf_mtap().
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_trunk.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c index 2e0ca2d7b2c..21ef6214424 100644 --- a/sys/net/if_trunk.c +++ b/sys/net/if_trunk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_trunk.c,v 1.14 2005/11/27 15:53:50 mcbride Exp $ */ +/* $OpenBSD: if_trunk.c,v 1.15 2005/12/17 23:44:29 brad Exp $ */ /* * Copyright (c) 2005 Reyk Floeter <reyk@vantronix.net> @@ -871,16 +871,16 @@ trunk_start(struct ifnet *ifp) if (m == NULL) break; - if (tr->tr_proto != TRUNK_PROTO_NONE) - error = (*tr->tr_start)(tr, m); - else - m_free(m); - #if NBPFILTER > 0 if (ifp->if_bpf) bpf_mtap(ifp->if_bpf, m); #endif + if (tr->tr_proto != TRUNK_PROTO_NONE) + error = (*tr->tr_start)(tr, m); + else + m_free(m); + if (error == 0) ifp->if_opackets++; else |