aboutsummaryrefslogtreecommitdiff
path: root/lib/meta-flow.h
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2012-07-22 23:20:22 -0700
committerBen Pfaff <blp@nicira.com>2012-07-23 09:21:37 -0700
commitcc34bc8c8611868474253b8fbd9e79cd66c60c94 (patch)
tree46ddd516ea85342fc05625029bc605431478b80b /lib/meta-flow.h
parentfb0451d9bfbfb1d2803423c4491fe2d4da4cdc3a (diff)
meta-flow: Add OF1.2-like MFF_VLAN_VID and MFF_VLAN_PCP.
OpenFlow 1.0 and 1.2 have notions of VLAN that are different enough to warrant separate "meta-flow" fields, which this commit adds. Signed-off-by: Ben Pfaff <blp@nicira.com> Acked-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'lib/meta-flow.h')
-rw-r--r--lib/meta-flow.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/meta-flow.h b/lib/meta-flow.h
index e4237d1c..28d43ebc 100644
--- a/lib/meta-flow.h
+++ b/lib/meta-flow.h
@@ -67,7 +67,9 @@ enum mf_field_id {
MFF_VLAN_TCI, /* be16 */
MFF_DL_VLAN, /* be16 (OpenFlow 1.0 compatibility) */
+ MFF_VLAN_VID, /* be16 (OpenFlow 1.2 compatibility) */
MFF_DL_VLAN_PCP, /* u8 (OpenFlow 1.0 compatibility) */
+ MFF_VLAN_PCP, /* be16 (OpenFlow 1.2 compatibility) */
/* L3. */
MFF_IPV4_SRC, /* be32 */