X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fdpif.h;h=8872a2ef76bee4c9ac8acf9f7b7ab736650a5be7;hb=e7668254f2f8f7208905c858ffbc84a65bb13815;hp=d25d20f301f32cce949d2ed1ce7802104e75c56a;hpb=982b88105d0a82ab90b233bf68e4e51ac9cddd23;p=openvswitch

diff --git a/lib/dpif.h b/lib/dpif.h
index d25d20f3..8872a2ef 100644
--- a/lib/dpif.h
+++ b/lib/dpif.h
@@ -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,7 +151,7 @@ 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_ACTION,             /* ODP_ACTION_ATTR_CONTROLLER action. */
     DPIF_UC_SAMPLE,             /* Packet sampling. */
     DPIF_N_UC_TYPES
 };
@@ -172,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. */