diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2005-06-16 11:10:48 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2005-06-16 11:10:48 +0000 |
| commit | cd815b46c3988dfb39c817ea4ebfaf460ae9dfda (patch) | |
| tree | e527d64953cfd12b7d000951bc47403f1ce378bc /sys | |
| parent | 1fd31d1d2eb1b3061f871caf672d19a9c8b8b8a1 (diff) | |
no need for NVLAN; ok jason, brad, camiel
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/if_bridge.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 2efe6328622..ebc4dd89084 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.143 2005/04/25 17:55:51 brad Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.144 2005/06/16 11:10:47 markus Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -34,7 +34,6 @@ #include "bpfilter.h" #include "gif.h" #include "pf.h" -#include "vlan.h" #include "carp.h" #include <sys/param.h> @@ -87,9 +86,7 @@ #include <net/bpf.h> #endif -#if NVLAN > 0 #include <net/if_vlan_var.h> -#endif #if NCARP > 0 #include <netinet/ip_carp.h> @@ -2472,7 +2469,6 @@ bridge_fragment(struct bridge_softc *sc, struct ifnet *ifp, goto dropit; #else etype = ntohs(eh->ether_type); -#if NVLAN > 0 if (etype == ETHERTYPE_VLAN && (ifp->if_capabilities & IFCAP_VLAN_MTU) && ((m->m_pkthdr.len - sizeof(struct ether_vlan_header)) <= @@ -2482,7 +2478,6 @@ bridge_fragment(struct bridge_softc *sc, struct ifnet *ifp, splx(s); return; } -#endif if (etype != ETHERTYPE_IP) { if (etype > ETHERMTU || m->m_pkthdr.len < (LLC_SNAPFRAMELEN + |