Merge branch 'master' into next

[sliver-openvswitch.git] / lib / dpif.h

diff --git a/lib/dpif.h b/lib/dpif.h
index aa54a38..b171793 100644 (file)
--- a/lib/dpif.h
+++ b/lib/dpif.h
@@ -26,10 +26,15 @@
 struct dpif;
 struct ofpbuf;
 struct svec;
+struct dpif_class;
 
 void dp_run(void);
 void dp_wait(void);
+
+int dp_register_provider(const struct dpif_class *);
+int dp_unregister_provider(const char *type);
 void dp_enumerate_types(struct svec *types);
+
 int dp_enumerate_names(const char *type, struct svec *names);
 void dp_parse_name(const char *datapath_name, char **name, char **type);
 
@@ -83,6 +88,8 @@ int dpif_execute(struct dpif *, uint16_t in_port,
 
 int dpif_recv_get_mask(const struct dpif *, int *listen_mask);
 int dpif_recv_set_mask(struct dpif *, int listen_mask);
+int dpif_get_sflow_probability(const struct dpif *, uint32_t *probability);
+int dpif_set_sflow_probability(struct dpif *, uint32_t probability);
 int dpif_recv(struct dpif *, struct ofpbuf **);
 int dpif_recv_purge(struct dpif *);
 void dpif_recv_wait(struct dpif *);