diff options
| author | Ben Pfaff <blp@nicira.com> | 2012-06-27 21:13:13 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-07-30 21:09:20 -0700 |
| commit | e2b9ac44c82590c2a9a27bff79ae43899277f703 (patch) | |
| tree | a00823e12f2ae5b89d5e352ee1a29f1f0cf2da55 /lib/ofp-msgs.c | |
| parent | a814ba0f15c749aec0c5815ec099d4e165f67016 (diff) | |
openflow: Rename OpenFlow 1.0 statistics messages with "10" infix.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Tested-by: Simon Horman <horms@verge.net.au>
Reviewed-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'lib/ofp-msgs.c')
| -rw-r--r-- | lib/ofp-msgs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ofp-msgs.c b/lib/ofp-msgs.c index 1d11e7f3..48ecafc6 100644 --- a/lib/ofp-msgs.c +++ b/lib/ofp-msgs.c @@ -174,13 +174,13 @@ ofphdrs_decode(struct ofphdrs *hdrs, } else if (hdrs->version == OFP10_VERSION && (hdrs->type == OFPT10_STATS_REQUEST || hdrs->type == OFPT10_STATS_REPLY)) { - const struct ofp_stats_msg *osm; + const struct ofp10_stats_msg *osm; /* Get statistic type (OFPST_*). */ if (length < sizeof *osm) { return OFPERR_OFPBRC_BAD_LEN; } - osm = (const struct ofp_stats_msg *) oh; + osm = (const struct ofp10_stats_msg *) oh; hdrs->stat = ntohs(osm->type); if (hdrs->stat == OFPST_VENDOR) { @@ -278,7 +278,7 @@ ofphdrs_len(const struct ofphdrs *hdrs) hdrs->type == OFPT10_STATS_REPLY) { return (hdrs->stat == OFPST_VENDOR ? sizeof(struct nicira10_stats_msg) - : sizeof(struct ofp_stats_msg)); + : sizeof(struct ofp10_stats_msg)); } } else { if (hdrs->type == OFPT11_STATS_REQUEST || @@ -619,7 +619,7 @@ ofpraw_put__(enum ofpraw raw, uint8_t version, ovs_be32 xid, } else if (version == OFP10_VERSION && (hdrs->type == OFPT10_STATS_REQUEST || hdrs->type == OFPT10_STATS_REPLY)) { - struct ofp_stats_msg *osm = buf->l2; + struct ofp10_stats_msg *osm = buf->l2; osm->type = htons(hdrs->stat); osm->flags = htons(0); @@ -855,7 +855,7 @@ static ovs_be16 * ofpmp_flags__(const struct ofp_header *oh) { return (oh->version == OFP10_VERSION - ? &((struct ofp_stats_msg *) oh)->flags + ? &((struct ofp10_stats_msg *) oh)->flags : &((struct ofp11_stats_msg *) oh)->flags); } |