* OFPUTIL_C_ARP_MATCH_IP is not present in Open Flow 1.2.
* OFPUTIL_C_PORT_BLOCKED is new in Open Flow 1.2.
Otherwise the Open Flow 1.2 capabilities are the same as those of
Open Flow 1.1.
Signed-off-by: Simon Horman <ho...@verge.net.au>
---
v4
* No change
v3
* No change
v2
* No change
---
lib/ofp-print.c | 1 +
lib/ofp-util.h | 9 +++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index 91ba909..f8867c3 100644
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -432,6 +432,7 @@ ofputil_capabilities_to_name(uint32_t bit)
case OFPUTIL_C_ARP_MATCH_IP: return "ARP_MATCH_IP";
case OFPUTIL_C_STP: return "STP";
case OFPUTIL_C_GROUP_STATS: return "GROUP_STATS";
+ case OFPUTIL_C_PORT_BLOCKED: return "PORT_BLOCKED";
}
return NULL;
diff --git a/lib/ofp-util.h b/lib/ofp-util.h
index 9f69fdd..d473e12 100644
--- a/lib/ofp-util.h
+++ b/lib/ofp-util.h
@@ -426,19 +426,24 @@ struct ofputil_phy_port {
};
enum ofputil_capabilities {
- /* OpenFlow 1.0 and 1.1 share these values for these capabilities. */
+ /* OpenFlow 1.0, 1.1 and 1.2 share these values for these capabilities. */
OFPUTIL_C_FLOW_STATS = 1 << 0, /* Flow statistics. */
OFPUTIL_C_TABLE_STATS = 1 << 1, /* Table statistics. */
OFPUTIL_C_PORT_STATS = 1 << 2, /* Port statistics. */
OFPUTIL_C_IP_REASM = 1 << 5, /* Can reassemble IP fragments. */
OFPUTIL_C_QUEUE_STATS = 1 << 6, /* Queue statistics. */
+
+ /* OpenFlow 1.0 and 1.1 share this capability. */
OFPUTIL_C_ARP_MATCH_IP = 1 << 7, /* Match IP addresses in ARP pkts. */
/* OpenFlow 1.0 only. */
OFPUTIL_C_STP = 1 << 3, /* 802.1d spanning tree. */
- /* OpenFlow 1.1 only. */
+ /* OpenFlow 1.1 and 1.2 share this capability. */
OFPUTIL_C_GROUP_STATS = 1 << 4, /* Group statistics. */
+
+ /* OpenFlow 1.2 only */
+ OFPUTIL_C_PORT_BLOCKED = 1 << 8, /* Switch will block looping ports */
};
enum ofputil_action_bitmap {
--
1.7.10.2.484.gcd07cc5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
