This is in preparation for supporting the Packet Out messages of other Open Flow versions.
Signed-off-by: Simon Horman <[email protected]> --- v2 * No change --- lib/learning-switch.c | 2 +- lib/ofp-print.c | 2 +- lib/ofp-util.c | 2 +- lib/ofp-util.h | 2 +- ofproto/ofproto.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/learning-switch.c b/lib/learning-switch.c index 9fad356..883dde2 100644 --- a/lib/learning-switch.c +++ b/lib/learning-switch.c @@ -266,7 +266,7 @@ lswitch_process_packet(struct lswitch *sw, struct rconn *rconn, case OFPUTIL_OFPT_GET_CONFIG_REPLY: case OFPUTIL_OFPT_SET_CONFIG: case OFPUTIL_OFPT_PORT_STATUS: - case OFPUTIL_OFPT_PACKET_OUT: + case OFPUTIL_OFPT10_PACKET_OUT: case OFPUTIL_OFPT10_FLOW_MOD: case OFPUTIL_OFPT11_FLOW_MOD: case OFPUTIL_OFPT_PORT_MOD: diff --git a/lib/ofp-print.c b/lib/ofp-print.c index f8867c3..174cd35 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -1439,7 +1439,7 @@ ofp_to_string__(const struct ofp_header *oh, ofp_print_port_status(string, msg); break; - case OFPUTIL_OFPT_PACKET_OUT: + case OFPUTIL_OFPT10_PACKET_OUT: ofp_print_packet_out(string, msg, verbosity); break; diff --git a/lib/ofp-util.c b/lib/ofp-util.c index 198e053..b96db0b 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -781,7 +781,7 @@ static const struct ofputil_msg_type ofputil_msg_types[] = { sizeof(struct ofp_flow_removed), 0), OFPT10(OFPT_PORT_STATUS, OFPT_PORT_STATUS, sizeof(struct ofp_port_status) + sizeof(struct ofp10_phy_port), 0), - OFPT10(OFPT_PACKET_OUT, OFPT10_PACKET_OUT, + OFPT10(OFPT10_PACKET_OUT, OFPT10_PACKET_OUT, sizeof(struct ofp_packet_out), 1), OFPT10(OFPT10_FLOW_MOD, OFPT10_FLOW_MOD, sizeof(struct ofp10_flow_mod), 1), diff --git a/lib/ofp-util.h b/lib/ofp-util.h index c0e362a..e4cc3cb 100644 --- a/lib/ofp-util.h +++ b/lib/ofp-util.h @@ -48,7 +48,7 @@ enum ofputil_msg_code { OFPUTIL_OFPT_PACKET_IN, OFPUTIL_OFPT_FLOW_REMOVED, OFPUTIL_OFPT_PORT_STATUS, - OFPUTIL_OFPT_PACKET_OUT, + OFPUTIL_OFPT10_PACKET_OUT, OFPUTIL_OFPT10_FLOW_MOD, OFPUTIL_OFPT11_FLOW_MOD, OFPUTIL_OFPT_PORT_MOD, diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index cafe417..cccd9dc 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -3310,7 +3310,7 @@ handle_openflow__(struct ofconn *ofconn, const struct ofpbuf *msg) case OFPUTIL_OFPT_SET_CONFIG: return handle_set_config(ofconn, msg->data); - case OFPUTIL_OFPT_PACKET_OUT: + case OFPUTIL_OFPT10_PACKET_OUT: return handle_packet_out(ofconn, msg->data); case OFPUTIL_OFPT_PORT_MOD: -- 1.7.10.2.484.gcd07cc5 _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
