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

[Sepherosa Ziehau]

Author: sephe
Date: Mon May 22 02:30:15 2017
New Revision: 318605
URL: https://svnweb.freebsd.org/changeset/base/318605

Log:
  MFC 318512
  
      net/vlan: Revert 305177
  
      Miss read the parentheses.
  
      Reported by:    oleg@
      Reviewed by:    hps@
      Sponsored by:   Microsoft

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 May 22 02:09:27 2017	(r318604)
+++ stable/10/sys/net/if_vlan_var.h	Mon May 22 02:30:15 2017	(r318605)
@@ -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) << 13) | ((cfi) & 1)) << 12) | ((vlid) & EVL_VLID_MASK))
+	((((((pri) & 7) << 1) | ((cfi) & 1)) << 12) | ((vlid) & EVL_VLID_MASK))
 
 /* Set the VLAN ID in an mbuf packet header non-destructively. */
 #define EVL_APPLY_VLID(m, vlid)						\