Don't hardcode vlan/queue priority for pppoe packets; inherit it from the

new "llprio" setting on the pppoe(4) interface instead.

Tested by Daniel Gillen and myself, ok mikeb

1 files changed, 3 insertions, 3 deletions

diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 181739b9940..b4ea8f6dec6 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_spppsubr.c,v 1.153 2016/05/30 23:30:10 sthen Exp $	*/
+/*	$OpenBSD: if_spppsubr.c,v 1.154 2016/06/14 20:44:43 sthen Exp $	*/
 /*
  * Synchronous PPP link level subroutines.
  *
@@ -914,7 +914,7 @@ sppp_cp_send(struct sppp *sp, u_short proto, u_char type,
 		return;
 	m->m_pkthdr.len = m->m_len = PKTHDRLEN + LCP_HEADER_LEN + len;
 	m->m_pkthdr.ph_ifidx = 0;
-	m->m_pkthdr.pf.prio = SPPP_CTL_PRIO;
+	m->m_pkthdr.pf.prio = sp->pp_if.if_llprio;
 
 	*mtod(m, u_int16_t *) = htons(proto);
 	lh = (struct lcp_header *)(mtod(m, u_int8_t *) + 2);
@@ -3992,7 +3992,7 @@ sppp_auth_send(const struct cp *cp, struct sppp *sp,
 	if (! m)
 		return;
 	m->m_pkthdr.ph_ifidx = 0;
-	m->m_pkthdr.pf.prio = SPPP_CTL_PRIO;
+	m->m_pkthdr.pf.prio = sp->pp_if.if_llprio;
 
 	*mtod(m, u_int16_t *) = htons(cp->proto);
 	lh = (struct lcp_header *)(mtod(m, u_int8_t *) + 2);