INSTALL.Linux: Mention that SSL options require building with SSL support.

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

diff --git a/lib/dpif.h b/lib/dpif.h
index 3534df7..0e0f407 100644 (file)
--- a/lib/dpif.h
+++ b/lib/dpif.h
@@ -34,7 +34,7 @@ struct ds;
 struct netdev;
 struct nlattr;
 struct ofpbuf;
-struct svec;
+struct sset;
 struct dpif_class;
 
 void dp_run(void);
@@ -42,9 +42,9 @@ 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);
+void dp_enumerate_types(struct sset *types);
 
-int dp_enumerate_names(const char *type, struct svec *names);
+int dp_enumerate_names(const char *type, struct sset *names);
 void dp_parse_name(const char *datapath_name, char **name, char **type);
 
 int dpif_open(const char *name, const char *type, struct dpif **);
@@ -54,7 +54,6 @@ void dpif_close(struct dpif *);
 
 const char *dpif_name(const struct dpif *);
 const char *dpif_base_name(const struct dpif *);
-int dpif_get_all_names(const struct dpif *, struct svec *);
 
 int dpif_delete(struct dpif *);
 
@@ -152,8 +151,9 @@ int dpif_execute(struct dpif *, const struct nlattr *actions,
 
 enum dpif_upcall_type {
     DPIF_UC_MISS,               /* Miss in flow table. */
-    DPIF_UC_ACTION,             /* ODPAT_CONTROLLER action. */
-    DPIF_UC_SAMPLE              /* Packet sampling. */
+    DPIF_UC_ACTION,             /* ODP_ACTION_ATTR_CONTROLLER action. */
+    DPIF_UC_SAMPLE,             /* Packet sampling. */
+    DPIF_N_UC_TYPES
 };
 
 /* A packet passed up from the datapath to userspace.
@@ -171,7 +171,7 @@ struct dpif_upcall {
     size_t key_len;             /* Length of 'key' in bytes. */
 
     /* DPIF_UC_ACTION only. */
-    uint64_t userdata;          /* Argument to ODPAT_CONTROLLER. */
+    uint64_t userdata;          /* Argument to ODP_ACTION_ATTR_CONTROLLER. */
 
     /* DPIF_UC_SAMPLE only. */
     uint32_t sample_pool;       /* # of sampling candidate packets so far. */