diff options
| author | Jarno Rajahalme <jarno@ovn.org> | 2016-11-14 13:24:55 -0800 |
|---|---|---|
| committer | Jarno Rajahalme <jarno@ovn.org> | 2016-11-14 13:24:55 -0800 |
| commit | 50b73fe16586ab18e5822ba9e952dd2fec539cf7 (patch) | |
| tree | 37570a9dea10ba3380c177e1a4e963832b516578 /include | |
| parent | 14bf7951a2da2253619390e81fa9c54f92751068 (diff) | |
| download | openvswitch-50b73fe16586ab18e5822ba9e952dd2fec539cf7.tar.gz | |
ofproto: Return the OFPC_BUNDLES bit in switch features reply.
Add definitions for the OpenFlow 1.4.1/1.5 specific capabilities bits
OFPC14_BUNDLES and OFPC14_FLOW_MONITORING. Return the bundles
capability bit in switch features reply.
Reported-by: Andrej Leitner <andrej.leitner@pantheon.tech>
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openflow/openflow-1.4.h | 6 | ||||
| -rw-r--r-- | include/openvswitch/ofp-util.h | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/include/openflow/openflow-1.4.h b/include/openflow/openflow-1.4.h index 4599f9566..fcebe4eb3 100644 --- a/include/openflow/openflow-1.4.h +++ b/include/openflow/openflow-1.4.h @@ -39,6 +39,12 @@ #include <openflow/openflow-1.3.h> +/* OpenFlow 1.4.1+ specific capabilities + * (struct ofp_switch_features, member capabilities). */ +enum ofp14_capabilities { + OFPC14_BUNDLES = 1 << 9, /* Switch supports bundles. */ + OFPC14_FLOW_MONITORING = 1 << 10, /* Switch supports flow monitoring. */ +}; /* ## ---------- ## */ /* ## ofp14_port ## */ diff --git a/include/openvswitch/ofp-util.h b/include/openvswitch/ofp-util.h index e4dacbf86..8703d2a3a 100644 --- a/include/openvswitch/ofp-util.h +++ b/include/openvswitch/ofp-util.h @@ -613,7 +613,7 @@ struct ofputil_phy_port { }; enum ofputil_capabilities { - /* OpenFlow 1.0, 1.1, 1.2, and 1.3 share these capability values. */ + /* All OpenFlow versions share these capability values. */ OFPUTIL_C_FLOW_STATS = 1 << 0, /* Flow statistics. */ OFPUTIL_C_TABLE_STATS = 1 << 1, /* Table statistics. */ OFPUTIL_C_PORT_STATS = 1 << 2, /* Port statistics. */ @@ -626,11 +626,16 @@ enum ofputil_capabilities { /* OpenFlow 1.0 only. */ OFPUTIL_C_STP = 1 << 3, /* 802.1d spanning tree. */ - /* OpenFlow 1.1, 1.2, and 1.3 share this capability. */ + /* OpenFlow 1.1+ only. Note that this bit value does not match the one + * in the OpenFlow message. */ OFPUTIL_C_GROUP_STATS = 1 << 4, /* Group statistics. */ - /* OpenFlow 1.2 and 1.3 share this capability */ + /* OpenFlow 1.2+ only. */ OFPUTIL_C_PORT_BLOCKED = 1 << 8, /* Switch will block looping ports */ + + /* OpenFlow 1.4+ only. */ + OFPUTIL_C_BUNDLES = 1 << 9, /* Switch supports bundles. */ + OFPUTIL_C_FLOW_MONITORING = 1 << 10, /* Switch supports flow monitoring. */ }; /* Abstract ofp_switch_features. */ |