diff options
| author | Renato Botelho <renato@netgate.com> | 2016-09-12 14:46:47 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-09-12 14:46:47 -0300 |
| commit | 710146e9ac46d798c3f15a8830f48e94bad137a5 (patch) | |
| tree | cbebe7a1c7a2faa1c2c3936972eca1134635b2b9 /sys/net | |
| parent | 39fd693a18f8ef73b1268f2321393d5ca6101e89 (diff) | |
| parent | 5986af9d01080d549cde638c5af2bef5fd977207 (diff) | |
| download | FreeBSD-src-710146e9ac46d798c3f15a8830f48e94bad137a5.zip FreeBSD-src-710146e9ac46d798c3f15a8830f48e94bad137a5.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_vlan_var.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h index b1950e1..924202b 100644 --- a/sys/net/if_vlan_var.h +++ b/sys/net/if_vlan_var.h @@ -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) \ |
