30c30
< * $FreeBSD: head/sys/net/if_ethersubr.c 151301 2005-10-13 23:05:55Z thompsa $
---
> * $FreeBSD: head/sys/net/if_ethersubr.c 151305 2005-10-14 02:38:47Z thompsa $
61a62
> #include <net/if_bridgevar.h>
108c109
< /* if_bridge(4) support. XXX: should go into some include. */
---
> /* if_bridge(4) support */
291,293c292,293
< KASSERT(bridge_output_p != NULL,
< ("%s: if_bridge not loaded!", __func__));
< return ((*bridge_output_p)(ifp, m, NULL, NULL));
---
> BRIDGE_OUTPUT(ifp, m, error);
> return (error);
588,591c588
< KASSERT(bridge_input_p != NULL,
< ("%s: if_bridge not loaded!", __func__));
<
< m = (*bridge_input_p)(ifp, m);
---
> BRIDGE_INPUT(ifp, m);
594,599d590
< /*
< * Bridge has determined that the packet is for us.
< * Update our interface pointer -- we may have had
< * to "bridge" the packet locally.
< */
< ifp = m->m_pkthdr.rcvif;