[ovs-dev] [PATCH] ofp-util: Fix inconsistencies in table features type.

Jarno Rajahalme jrajahalme at nicira.com
Mon Mar 24 17:24:25 UTC 2014


Pushed to master,

  Jarno

On Mar 24, 2014, at 10:14 AM, Ben Pfaff <blp at nicira.com> wrote:

> Looks good, thank you.
> 
> On Mar 24, 2014 10:12 AM, "Jarno Rajahalme" <jrajahalme at nicira.com> wrote:
> '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 <jrajahalme at nicira.com>
> ---
>  lib/ofp-print.c            |    2 +-
>  ofproto/ofproto-provider.h |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/ofp-print.c b/lib/ofp-print.c
> index f9fd4c5..da89405 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 dd10f3a..8c11aff 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.
>       *
> --
> 1.7.10.4
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openvswitch.org/pipermail/ovs-dev/attachments/20140324/6d99731a/attachment-0005.html>


More information about the dev mailing list