aboutsummaryrefslogtreecommitdiff
path: root/lib/dpif.h
diff options
context:
space:
mode:
authorJustin Pettit <jpettit@nicira.com>2011-08-18 10:35:40 -0700
committerJustin Pettit <jpettit@nicira.com>2011-08-19 22:48:23 -0700
commitdf2c07f4338faac04f4969f243fe4e8083b309ac (patch)
tree33d2b377ab21c76a122e656a032e340105d16ef9 /lib/dpif.h
parent1c313b88e1ba908b4f30ce2b3702d57e8f4d9a38 (diff)
datapath: Use "OVS_*" as opposed to "ODP_*" for user<->kernel interactions.
The prefix "ODP_*" is not overly descriptive in the context of the larger Linux tree. This commit changes the prefix to "OVS_*" for the userpace to kernel interactions. The userspace libraries still use "ODP_" in many of their interfaces since it is more descriptive in the OVS oeuvre. Feature #6904 Signed-off-by: Justin Pettit <jpettit@nicira.com> Acked-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'lib/dpif.h')
-rw-r--r--lib/dpif.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/dpif.h b/lib/dpif.h
index 4df23184..1f352065 100644
--- a/lib/dpif.h
+++ b/lib/dpif.h
@@ -58,7 +58,7 @@ const char *dpif_base_name(const struct dpif *);
int dpif_delete(struct dpif *);
-int dpif_get_dp_stats(const struct dpif *, struct odp_stats *);
+int dpif_get_dp_stats(const struct dpif *, struct ovs_dp_stats *);
int dpif_get_drop_frags(const struct dpif *, bool *drop_frags);
int dpif_set_drop_frags(struct dpif *, bool drop_frags);
@@ -155,7 +155,7 @@ int dpif_execute(struct dpif *,
enum dpif_upcall_type {
DPIF_UC_MISS, /* Miss in flow table. */
- DPIF_UC_ACTION, /* ODP_ACTION_ATTR_USERSPACE action. */
+ DPIF_UC_ACTION, /* OVS_ACTION_ATTR_USERSPACE action. */
DPIF_UC_SAMPLE, /* Packet sampling. */
DPIF_N_UC_TYPES
};
@@ -177,7 +177,7 @@ struct dpif_upcall {
size_t key_len; /* Length of 'key' in bytes. */
/* DPIF_UC_ACTION only. */
- uint64_t userdata; /* Argument to ODP_ACTION_ATTR_USERSPACE. */
+ uint64_t userdata; /* Argument to OVS_ACTION_ATTR_USERSPACE. */
/* DPIF_UC_SAMPLE only. */
uint32_t sample_pool; /* # of sampling candidate packets so far. */