projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vconn: Ensure that vconn_run() is enough to complete a connection.
[openvswitch]
/
lib
/
meta-flow.h
diff --git
a/lib/meta-flow.h
b/lib/meta-flow.h
index e4237d1cbd12b91e2756b044062c5a78f7b21c26..12a4baa26868f41e11f4802c6346f3e7f0db0647 100644
(file)
--- 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_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_DL_VLAN_PCP, /* u8 (OpenFlow 1.0 compatibility) */
+ MFF_VLAN_PCP, /* be16 (OpenFlow 1.2 compatibility) */
/* L3. */
MFF_IPV4_SRC, /* be32 */
/* L3. */
MFF_IPV4_SRC, /* be32 */
@@
-154,6
+156,7
@@
enum mf_prereqs {
/* L2 requirements. */
MFP_ARP,
/* L2 requirements. */
MFP_ARP,
+ MFP_VLAN_VID,
MFP_IPV4,
MFP_IPV6,
MFP_IP_ANY,
MFP_IPV4,
MFP_IPV6,
MFP_IP_ANY,