diff options
Diffstat (limited to 'sys/net/if_ethersubr.c')
| -rw-r--r-- | sys/net/if_ethersubr.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 1485c2766546..ca66eb0dc906 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -31,13 +31,12 @@ * SUCH DAMAGE. * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 - * $Id: if_ethersubr.c,v 1.53 1998/12/14 17:58:05 luigi Exp $ + * $Id: if_ethersubr.c,v 1.51 1998/06/14 20:58:14 julian Exp $ */ #include "opt_atalk.h" #include "opt_inet.h" #include "opt_ipx.h" -#include "opt_bdg.h" #include <sys/param.h> #include <sys/systm.h> @@ -102,10 +101,6 @@ extern u_char at_org_code[3]; extern u_char aarp_org_code[3]; #endif /* NETATALK */ -#ifdef BRIDGE -#include <net/bridge.h> -#endif - #include "vlan.h" #if NVLAN > 0 #include <net/if_vlan_var.h> @@ -374,22 +369,10 @@ ether_output(ifp, m0, dst, rt0) } else if (bcmp(eh->ether_dhost, eh->ether_shost, ETHER_ADDR_LEN) == 0) { (void) if_simloop(ifp, m, dst, hlen); - return (0); /* XXX */ + return(0); /* XXX */ } } -#ifdef BRIDGE - if (do_bridge) { - struct mbuf *m0 = m ; - - if (m->m_pkthdr.rcvif) - m->m_pkthdr.rcvif = NULL ; - ifp = bridge_dst_lookup(m); - bdg_forward(&m0, ifp); - if (m0) - m_freem(m0); - return (0); - } -#endif + s = splimp(); /* * Queue message on interface, and start output if interface |