Signed-off-by: Ben Pfaff <b...@nicira.com>
---
v3: New patch.
---
include/openflow/openflow-1.0.h | 2 --
include/openflow/openflow-1.1.h | 4 +---
include/openflow/openflow-common.h | 4 ++++
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/openflow/openflow-1.0.h b/include/openflow/openflow-1.0.h
index 831f6a9..bf4fd91 100644
--- a/include/openflow/openflow-1.0.h
+++ b/include/openflow/openflow-1.0.h
@@ -47,8 +47,6 @@ enum ofp_port {
* types. */
enum ofp10_type {
/* Controller command messages. */
- OFPT10_PACKET_OUT = 13, /* Controller/switch message */
- OFPT10_FLOW_MOD, /* Controller/switch message */
OFPT10_PORT_MOD, /* Controller/switch message */
/* Statistics messages. */
diff --git a/include/openflow/openflow-1.1.h b/include/openflow/openflow-1.1.h
index 8461dad..f0c063b 100644
--- a/include/openflow/openflow-1.1.h
+++ b/include/openflow/openflow-1.1.h
@@ -74,9 +74,7 @@
* types. */
enum ofp11_type {
/* Controller command messages. */
- OFPT11_PACKET_OUT = 13, /* Controller/switch message */
- OFPT11_FLOW_MOD, /* Controller/switch message */
- OFPT11_GROUP_MOD, /* Controller/switch message */
+ OFPT11_GROUP_MOD = 15, /* Controller/switch message */
OFPT11_PORT_MOD, /* Controller/switch message */
OFPT11_TABLE_MOD, /* Controller/switch message */
diff --git a/include/openflow/openflow-common.h
b/include/openflow/openflow-common.h
index 3dc76cc..9788af1 100644
--- a/include/openflow/openflow-common.h
+++ b/include/openflow/openflow-common.h
@@ -103,6 +103,10 @@ enum ofp_type {
OFPT_PACKET_IN, /* Async message */
OFPT_FLOW_REMOVED, /* Async message */
OFPT_PORT_STATUS, /* Async message */
+
+ /* Controller command messages. */
+ OFPT_PACKET_OUT, /* Controller/switch message */
+ OFPT_FLOW_MOD, /* Controller/switch message */
};
/* Header on all OpenFlow packets. */
--
1.7.2.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
