diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2016-03-29 04:33:17 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2016-03-29 04:33:17 +0000 |
| commit | e4beab1c695b53da0a1b8c686e8cd3e121dd52f5 (patch) | |
| tree | 8b6bfb098f12f8107530b7e3948899e1e84e77fe /sys/net/if_vlan.c | |
| parent | d893eacc2da725ca6e86d7081d30b1af5a377fcb (diff) | |
use sizeof(*evl) instead of EVL_ENCAPLEN in vlan_input
Diffstat (limited to 'sys/net/if_vlan.c')
| -rw-r--r-- | sys/net/if_vlan.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 15b3dee3d30..170bc9f732b 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vlan.c,v 1.156 2016/03/28 13:05:22 dlg Exp $ */ +/* $OpenBSD: if_vlan.c,v 1.157 2016/03/29 04:33:16 dlg Exp $ */ /* * Copyright 1998 Massachusetts Institute of Technology @@ -336,8 +336,8 @@ vlan_input(struct ifnet *ifp0, struct mbuf *m, void *cookie) etype = ETHERTYPE_VLAN; tagh = vlan_tagh; } else if ((etype == ETHERTYPE_VLAN) || (etype == ETHERTYPE_QINQ)) { - if (m->m_len < EVL_ENCAPLEN && - (m = m_pullup(m, EVL_ENCAPLEN)) == NULL) { + if (m->m_len < sizeof(*evl) && + (m = m_pullup(m, sizeof(*evl))) == NULL) { ifp0->if_ierrors++; return (1); } @@ -395,8 +395,8 @@ vlan_input(struct ifnet *ifp0, struct mbuf *m, void *cookie) m->m_flags &= ~M_VLANTAG; } else { eh->ether_type = evl->evl_proto; - memmove((char *)eh + EVL_ENCAPLEN, eh, sizeof(*eh)); - m_adj(m, EVL_ENCAPLEN); + memmove((char *)eh + sizeof(*evl), eh, sizeof(*eh)); + m_adj(m, sizeof(*evl)); } ml_enqueue(&ml, m); |