summaryrefslogtreecommitdiff
path: root/sys/net/if_vlan.c
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@cvs.openbsd.org>2009-01-27 15:56:59 +0000
committerChristian Weisgerber <naddy@cvs.openbsd.org>2009-01-27 15:56:59 +0000
commitc0df24b30ba77526098c5236779317c694961265 (patch)
tree10bd47a4e874b1d4c3c4a9f1768f21f1e7afe236 /sys/net/if_vlan.c
parent1fa0acbd00211dd8b889e3aa415d3d67e3f8f2cc (diff)
include the VLAN priority for hardware tagging, too; ok claudio@
Diffstat (limited to 'sys/net/if_vlan.c')
-rw-r--r--sys/net/if_vlan.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 955f8715f34..49d9092abb3 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vlan.c,v 1.77 2008/10/16 19:18:03 naddy Exp $ */
+/* $OpenBSD: if_vlan.c,v 1.78 2009/01/27 15:56:58 naddy Exp $ */
/*
* Copyright 1998 Massachusetts Institute of Technology
@@ -209,7 +209,8 @@ vlan_start(struct ifnet *ifp)
* the packet along.
*/
if (p->if_capabilities & IFCAP_VLAN_HWTAGGING) {
- m->m_pkthdr.ether_vtag = ifv->ifv_tag;
+ m->m_pkthdr.ether_vtag = ifv->ifv_tag +
+ (ifv->ifv_prio << EVL_PRIO_BITS);
m->m_flags |= M_VLANTAG;
} else {
struct ether_vlan_header evh;