git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "master" into "next".
[sliver-openvswitch.git]
/
lib
/
packets.h
diff --git
a/lib/packets.h
b/lib/packets.h
index
7651495
..
7ea462b
100644
(file)
--- a/
lib/packets.h
+++ b/
lib/packets.h
@@
-190,7
+190,10
@@
struct llc_snap_header {
BUILD_ASSERT_DECL(LLC_SNAP_HEADER_LEN == sizeof(struct llc_snap_header));
#define VLAN_VID_MASK 0x0fff
+#define VLAN_VID_SHIFT 0
+
#define VLAN_PCP_MASK 0xe000
+#define VLAN_PCP_SHIFT 13
#define VLAN_HEADER_LEN 4
struct vlan_header {