Merge branch 'master' into pdu
diff --git a/c_gen/templates/loci_show.h b/c_gen/templates/loci_show.h
index 34704f2..04d863f 100644
--- a/c_gen/templates/loci_show.h
+++ b/c_gen/templates/loci_show.h
@@ -351,7 +351,7 @@
#define LOCI_SHOW_u32_bsn_l3_interface_class_id(writer, cookie, val) LOCI_SHOW_u32(writer, cookie, val)
#define LOCI_SHOW_u32_bsn_l3_src_class_id(writer, cookie, val) LOCI_SHOW_u32(writer, cookie, val)
#define LOCI_SHOW_u32_bsn_l3_dst_class_id(writer, cookie, val) LOCI_SHOW_u32(writer, cookie, val)
-#define LOCI_SHOW_u16_convergence_status(writer, cookie, val) LOCI_SHOW_u16(writer, cookie, val)
+#define LOCI_SHOW_u8_convergence_status(writer, cookie, val) LOCI_SHOW_u8(writer, cookie, val)
#define LOCI_SHOW_u16_actor_sys_priority(writer, cookie, val) LOCI_SHOW_u16(writer, cookie, val)
#define LOCI_SHOW_mac_actor_sys_mac(writer, cookie, val) LOCI_SHOW_mac(writer, cookie, val)
#define LOCI_SHOW_u16_actor_port_priority(writer, cookie, val) LOCI_SHOW_u16(writer, cookie, val)
diff --git a/openflow_input/bsn_lacp b/openflow_input/bsn_lacp
index 23a5bc2..8237641 100644
--- a/openflow_input/bsn_lacp
+++ b/openflow_input/bsn_lacp
@@ -28,10 +28,10 @@
// express or implied. See the EPL for the specific language
// governing permissions and limitations under the EPL.
-#version any
+#version 4
// LACP Convergence Status set in of_bsn_lacp_convergence_notif message
-enum of_bsn_lacp_convergence_status_t(wire_type=uint16_t, complete=False) {
+enum of_bsn_lacp_convergence_status_t(wire_type=uint8_t, complete=False) {
LACP_SUCCESS = 0,
LACP_TIMEDOUT = 1,
LACP_OUT_OF_SYNC = 2,
@@ -45,7 +45,7 @@
uint32_t experimenter == 0x5c16c7;
uint32_t subtype == 41;
uint8_t enabled;
- pad(1);
+ pad(3);
of_port_no_t port_no;
uint16_t actor_sys_priority;
of_mac_addr_t actor_sys_mac;
@@ -63,11 +63,6 @@
uint32_t subtype == 42;
uint32_t status;
of_port_no_t port_no;
- uint16_t actor_sys_priority;
- of_mac_addr_t actor_sys_mac;
- uint16_t actor_port_priority;
- uint16_t actor_port_num;
- uint16_t actor_key;
};
struct of_bsn_lacp_convergence_notif : of_bsn_header {
@@ -77,7 +72,8 @@
uint32_t xid;
uint32_t experimenter == 0x5c16c7;
uint32_t subtype == 43;
- uint16_t convergence_status;
+ uint8_t convergence_status;
+ pad(3);
of_port_no_t port_no;
uint16_t actor_sys_priority;