From: Jarno Rajahalme Date: Mon, 24 Mar 2014 17:16:03 +0000 (-0700) Subject: ofp-util: Fix inconsistencies in table features type. X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=2ee9b978da459475efdbbcc557740152df85accf ofp-util: Fix inconsistencies in table features type. 'metadata_match' and 'metadata_write' fields are defined as ovs_be64, but sometimes used and referred to as uint64_t. Signed-off-by: Jarno Rajahalme --- diff --git a/lib/ofp-print.c b/lib/ofp-print.c index f9fd4c541..da8940551 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -2625,7 +2625,7 @@ ofp_print_table_features(struct ds *s, const struct ofp_header *oh) ds_put_format(s, "\n table %"PRIu8":\n", tf.table_id); ds_put_format(s, " name=\"%s\"\n", tf.name); ds_put_format(s, " metadata: match=%#"PRIx64" write=%#"PRIx64"\n", - tf.metadata_match, tf.metadata_write); + ntohll(tf.metadata_match), ntohll(tf.metadata_write)); ds_put_cstr(s, " config="); ofp_print_table_miss_config(s, tf.config); diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h index dd10f3a2e..8c11aff82 100644 --- a/ofproto/ofproto-provider.h +++ b/ofproto/ofproto-provider.h @@ -835,7 +835,7 @@ struct ofproto_class { * * - 'write_setfields' and 'apply_setfields' to OFPXMT12_MASK. * - * - 'metadata_match' and 'metadata_write' to UINT64_MAX. + * - 'metadata_match' and 'metadata_write' to OVS_BE64_MAX. * * - 'instructions' to OFPIT11_ALL. *