diff options
| -rw-r--r-- | sys/net/ethertypes.h | 3 | ||||
| -rw-r--r-- | sys/net/if_bridge.c | 4 | ||||
| -rw-r--r-- | sys/net/if_ethersubr.c | 4 | ||||
| -rw-r--r-- | sys/net/if_vlan.c | 6 |
4 files changed, 8 insertions, 9 deletions
diff --git a/sys/net/ethertypes.h b/sys/net/ethertypes.h index aee162644a3..37ea3fb70e3 100644 --- a/sys/net/ethertypes.h +++ b/sys/net/ethertypes.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ethertypes.h,v 1.4 2003/06/02 23:28:11 millert Exp $ */ +/* $OpenBSD: ethertypes.h,v 1.5 2005/04/25 01:34:27 brad Exp $ */ /* $NetBSD: ethertypes.h,v 1.13 2002/02/10 01:28:32 thorpej Exp $ */ /* @@ -219,7 +219,6 @@ #define ETHERTYPE_AARP 0x80F3 /* AppleTalk AARP */ /* 0x80F4 - 0x80F5 Kinetics */ #define ETHERTYPE_APOLLO 0x80F7 /* Apollo Computer */ -#define ETHERTYPE_8021Q 0x8100 /* IEEE 802.1Q VLAN tagging (XXX conflicts) */ #define ETHERTYPE_VLAN 0x8100 /* IEEE 802.1Q VLAN tagging (XXX conflicts) */ /* 0x80FF - 0x8101 Wellfleet Communications (XXX conflicts) */ #define ETHERTYPE_BOFL 0x8102 /* Wellfleet; BOFL (Breath OF Life) pkts [every 5-10 secs.] */ diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 8f2d24d901d..827fc757f1d 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.141 2004/12/23 09:32:55 camield Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.142 2005/04/25 01:34:27 brad Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -2473,7 +2473,7 @@ bridge_fragment(struct bridge_softc *sc, struct ifnet *ifp, #else etype = ntohs(eh->ether_type); #if NVLAN > 0 - if (etype == ETHERTYPE_8021Q && + if (etype == ETHERTYPE_VLAN && (ifp->if_capabilities & IFCAP_VLAN_MTU) && ((m->m_pkthdr.len - sizeof(struct ether_vlan_header)) <= ifp->if_mtu)) { diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 2a832916b5c..6b5c799a57c 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ethersubr.c,v 1.88 2005/01/18 23:26:52 mpf Exp $ */ +/* $OpenBSD: if_ethersubr.c,v 1.89 2005/04/25 01:34:27 brad Exp $ */ /* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */ /* @@ -667,7 +667,7 @@ ether_input(ifp, eh, m) #endif #if NVLAN > 0 - if (etype == ETHERTYPE_8021Q) { + if (etype == ETHERTYPE_VLAN) { if (vlan_input(eh, m) < 0) ifp->if_noproto++; return; diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index eb302cc7375..92faeb7dddd 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vlan.c,v 1.53 2005/04/24 10:16:10 brad Exp $ */ +/* $OpenBSD: if_vlan.c,v 1.54 2005/04/25 01:34:26 brad Exp $ */ /* * Copyright 1998 Massachusetts Institute of Technology @@ -220,7 +220,7 @@ vlan_start(struct ifnet *ifp) m_copydata(m, 0, ETHER_HDR_LEN, (caddr_t)&evh); evh.evl_proto = evh.evl_encap_proto; - evh.evl_encap_proto = htons(ETHERTYPE_8021Q); + evh.evl_encap_proto = htons(ETHERTYPE_VLAN); evh.evl_tag = htons(ifv->ifv_tag); m_adj(m, ETHER_HDR_LEN); @@ -285,7 +285,7 @@ vlan_input_tag(struct mbuf *m, u_int16_t t) m_copydata(m, 0, ETHER_HDR_LEN, (caddr_t)&vh); vh.evl_proto = vh.evl_encap_proto; vh.evl_tag = htons(t); - vh.evl_encap_proto = htons(ETHERTYPE_8021Q); + vh.evl_encap_proto = htons(ETHERTYPE_VLAN); m_adj(m, ETHER_HDR_LEN); m = m_prepend(m, sizeof(struct ether_vlan_header), M_DONTWAIT); if (m == NULL) |