add support for configuring rxprio.

vlan already used the 802.1p prio in packets to set the mbuf prio.
this maintains that as the default.

ok claudio@

2 files changed, 34 insertions, 7 deletions

diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index cf7d342abcd..74dd2b295ed 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vlan.c,v 1.183 2019/02/15 13:00:51 mpi Exp $	*/
+/*	$OpenBSD: if_vlan.c,v 1.184 2019/04/19 04:36:11 dlg Exp $	*/
 
 /*
  * Copyright 1998 Massachusetts Institute of Technology
@@ -174,6 +174,7 @@ vlan_clone_create(struct if_clone *ifc, int unit)
 
 	refcnt_init(&ifv->ifv_refcnt);
 	ifv->ifv_prio = IF_HDRPRIO_PACKET;
+	ifv->ifv_rxprio = IF_HDRPRIO_OUTER;
 
 	ifp->if_flags = IFF_BROADCAST | IFF_MULTICAST;
 	ifp->if_xflags = IFXF_CLONED|IFXF_MPSAFE;
@@ -373,11 +374,6 @@ vlan_input(struct ifnet *ifp0, struct mbuf *m, void *cookie)
 
 	/* From now on ether_vtag is fine */
 	tag = EVL_VLANOFTAG(m->m_pkthdr.ether_vtag);
-	m->m_pkthdr.pf.prio = EVL_PRIOFTAG(m->m_pkthdr.ether_vtag);
-
-	/* IEEE 802.1p has prio 0 and 1 swapped */
-	if (m->m_pkthdr.pf.prio <= 1)
-		m->m_pkthdr.pf.prio = !m->m_pkthdr.pf.prio;
 
 	list = &tagh[TAG_HASH(tag)];
 	SRPL_FOREACH(ifv, &sr, list, ifv_list) {
@@ -408,6 +404,20 @@ vlan_input(struct ifnet *ifp0, struct mbuf *m, void *cookie)
 		m_adj(m, EVL_ENCAPLEN);
 	}
 
+	switch (ifv->ifv_rxprio) {
+	case IF_HDRPRIO_PACKET:
+		break;
+	case IF_HDRPRIO_OUTER:
+		m->m_pkthdr.pf.prio = EVL_PRIOFTAG(m->m_pkthdr.ether_vtag);
+		break;
+	default:
+		m->m_pkthdr.pf.prio = ifv->ifv_rxprio;
+		/* IEEE 802.1p has prio 0 and 1 swapped */
+		if (m->m_pkthdr.pf.prio <= 1)
+			m->m_pkthdr.pf.prio = !m->m_pkthdr.pf.prio;
+		break;
+	}
+
 	ml_enqueue(&ml, m);
 	if_input(&ifv->ifv_if, &ml);
 	SRPL_LEAVE(&sr);
@@ -738,6 +748,22 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		ifr->ifr_hdrprio = ifv->ifv_prio;
 		break;
 
+	case SIOCSRXHPRIO:
+		if (ifr->ifr_hdrprio == IF_HDRPRIO_PACKET ||
+		    ifr->ifr_hdrprio == IF_HDRPRIO_OUTER)
+			;
+		else if (ifr->ifr_hdrprio > IF_HDRPRIO_MAX ||
+		    ifr->ifr_hdrprio < IF_HDRPRIO_MIN) {
+			error = EINVAL;
+			break;
+		}
+
+		ifv->ifv_rxprio = ifr->ifr_hdrprio;
+		break;
+	case SIOCGRXHPRIO:
+		ifr->ifr_hdrprio = ifv->ifv_rxprio;
+		break;
+
 	default:
 		error = ether_ioctl(ifp, &ifv->ifv_ac, cmd, data);
 		break;
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
index 37e69443084..4f35cdb996f 100644
--- a/sys/net/if_vlan_var.h
+++ b/sys/net/if_vlan_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vlan_var.h,v 1.39 2019/02/15 13:00:51 mpi Exp $	*/
+/*	$OpenBSD: if_vlan_var.h,v 1.40 2019/04/19 04:36:12 dlg Exp $	*/
 
 /*
  * Copyright 1998 Massachusetts Institute of Technology
@@ -62,6 +62,7 @@ struct vlan_mc_entry {
 struct	ifvlan {
 	struct	arpcom ifv_ac;	/* make this an interface */
 	unsigned int ifv_ifidx0;	/* parent interface of this vlan */
+	int ifv_rxprio;
 	struct	ifv_linkmib {
 		int ifvm_prio; /* prio to apply on packet leaving if */
 		u_int16_t ifvm_proto; /* encapsulation ethertype */