svn commit: r305732 - stable/10/sys/net

[Sepherosa Ziehau]

Author: sephe
Date: Mon Sep 12 08:32:06 2016
New Revision: 305732
URL: https://svnweb.freebsd.org/changeset/base/305732

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/10/sys/net/if_vlan_var.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/net/if_vlan_var.h
==============================================================================
--- stable/10/sys/net/if_vlan_var.h	Mon Sep 12 08:14:11 2016	(r305731)
+++ stable/10/sys/net/if_vlan_var.h	Mon Sep 12 08:32:06 2016	(r305732)
@@ -46,7 +46,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))
 
 /* Set the VLAN ID in an mbuf packet header non-destructively. */
 #define EVL_APPLY_VLID(m, vlid)						\