'get_datapath_cap' callback was mistakenly placed in 'Connection tracking' section of the 'struct dpif_class' while belongs to the 'Datapath information'.
CC: William Tu <[email protected]> Fixes: 27501802d09f ("ofproto-dpif: Expose datapath capability to ovsdb.") Signed-off-by: Ilya Maximets <[email protected]> --- ofproto/ofproto-dpif.c | 2 +- ofproto/ofproto-provider.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 63c3d8b71..b5c81a2ca 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -6709,9 +6709,9 @@ const struct ofproto_class ofproto_dpif_class = { NULL, /* group_modify */ group_get_stats, /* group_get_stats */ get_datapath_version, /* get_datapath_version */ + get_datapath_cap, type_set_config, ct_flush, /* ct_flush */ ct_set_zone_timeout_policy, ct_del_zone_timeout_policy, - get_datapath_cap, }; diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h index afe9e2fec..a9622876c 100644 --- a/ofproto/ofproto-provider.h +++ b/ofproto/ofproto-provider.h @@ -1873,6 +1873,9 @@ struct ofproto_class { */ const char *(*get_datapath_version)(const struct ofproto *); + /* Get capabilities of the datapath type 'dp_type'. */ + void (*get_datapath_cap)(const char *dp_type, struct smap *caps); + /* Pass custom configuration options to the 'type' datapath. * * This function should be NULL if an implementation does not support it. @@ -1895,8 +1898,6 @@ struct ofproto_class { /* Deletes the timeout policy associated with 'zone' in datapath type * 'dp_type'. */ void (*ct_del_zone_timeout_policy)(const char *dp_type, uint16_t zone); - /* Get the datapath's capabilities. */ - void (*get_datapath_cap)(const char *dp_type, struct smap *caps); }; extern const struct ofproto_class ofproto_dpif_class; -- 2.17.1 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
