svn commit: r305731 - stable/11/sys/net

[Sepherosa Ziehau]

Author: sephe
Date: Mon Sep 12 08:14:11 2016
New Revision: 305731
URL: https://svnweb.freebsd.org/changeset/base/305731

Log:
  MFC 305177
      net/vlan: Shift for pri is 13 (pri mask 0xe000) not 1.
  
      Reviewed by:    araujo, hps
      Sponsored by:   Microsoft
      Differential Revision:  https://reviews.freebsd.org/D7710

Modified:
  stable/11/sys/net/ethernet.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/net/ethernet.h
==============================================================================
--- stable/11/sys/net/ethernet.h	Mon Sep 12 06:12:28 2016	(r305730)
+++ stable/11/sys/net/ethernet.h	Mon Sep 12 08:14:11 2016	(r305731)
@@ -89,7 +89,7 @@ struct ether_vlan_header {
 #define	EVL_PRIOFTAG(tag)	(((tag) >> 13) & 7)
 #define	EVL_CFIOFTAG(tag)	(((tag) >> 12) & 1)
 #define	EVL_MAKETAG(vlid, pri, cfi)					\
-	((((((pri) & 7) << 1) | ((cfi) & 1)) << 12) | ((vlid) & EVL_VLID_MASK))
+	((((((pri) & 7) << 13) | ((cfi) & 1)) << 12) | ((vlid) & EVL_VLID_MASK))
 
 /*
  *  NOTE: 0x0000-0x05DC (0..1500) are generally IEEE 802.3 length fields.