diff options
author | Jarno Rajahalme <jarno.rajahalme@nsn.com> | 2012-12-03 12:37:56 +0200 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2012-12-03 13:03:06 -0800 |
commit | 31a9e63f0f7e771c849f7ef45c9827fcc78abe03 (patch) | |
tree | 312c6e524cc342ab613e98495e8e28f1f6d9360c /lib/ofp-msgs.h | |
parent | 90ef0206ea8f5a395c70de797e87ac4eb904cb0d (diff) |
include/openflow: Moved remaining common definitions from openflow-1.0.h
Moved remaining common definitions from openflow-1.0.h to
openflow-common.h and renamed 1.0 specific definitions with
the "10" infix. Added hstamp rules for new headers, fixed
non-ASCII characters in openflow-1.3.h, Commented out
trailing zero-length data members.
Signed-off-by: Jarno Rajahalme <jarno.rajahalme@nsn.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/ofp-msgs.h')
-rw-r--r-- | lib/ofp-msgs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ofp-msgs.h b/lib/ofp-msgs.h index 496d120a..8d28ce36 100644 --- a/lib/ofp-msgs.h +++ b/lib/ofp-msgs.h @@ -142,9 +142,9 @@ enum ofpraw { /* OFPT 1.0+ (9): struct ofp_switch_config. */ OFPRAW_OFPT_SET_CONFIG, - /* OFPT 1.0 (10): struct ofp_packet_in up to data, uint8_t[]. */ + /* OFPT 1.0 (10): struct ofp10_packet_in up to data, uint8_t[]. */ OFPRAW_OFPT10_PACKET_IN, - /* OFPT 1.1 (10): struct ofp11_packet_in up to data, uint8_t[]. */ + /* OFPT 1.1 (10): struct ofp11_packet_in, uint8_t[]. */ OFPRAW_OFPT11_PACKET_IN, /* OFPT 1.2 (10): struct ofp12_packet_in, uint8_t[]. */ OFPRAW_OFPT12_PACKET_IN, @@ -153,7 +153,7 @@ enum ofpraw { /* NXT 1.0+ (17): struct nx_packet_in, uint8_t[]. */ OFPRAW_NXT_PACKET_IN, - /* OFPT 1.0 (11): struct ofp_flow_removed. */ + /* OFPT 1.0 (11): struct ofp10_flow_removed. */ OFPRAW_OFPT10_FLOW_REMOVED, /* OFPT 1.1+ (11): struct ofp11_flow_removed, uint8_t[8][]. */ OFPRAW_OFPT11_FLOW_REMOVED, @@ -165,7 +165,7 @@ enum ofpraw { /* OFPT 1.1+ (12): struct ofp_port_status, struct ofp11_port. */ OFPRAW_OFPT11_PORT_STATUS, - /* OFPT 1.0 (13): struct ofp_packet_out, uint8_t[]. */ + /* OFPT 1.0 (13): struct ofp10_packet_out, uint8_t[]. */ OFPRAW_OFPT10_PACKET_OUT, /* OFPT 1.1+ (13): struct ofp11_packet_out, uint8_t[]. */ OFPRAW_OFPT11_PACKET_OUT, |