projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Use ofconn_send_reply() for sending OpenFlow replies.
[openvswitch]
/
lib
/
dpif.h
diff --git
a/lib/dpif.h
b/lib/dpif.h
index d25d20f301f32cce949d2ed1ce7802104e75c56a..8872a2ef76bee4c9ac8acf9f7b7ab736650a5be7 100644
(file)
--- 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 *);
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 *);
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. */
enum dpif_upcall_type {
DPIF_UC_MISS, /* Miss in flow table. */
- DPIF_UC_ACTION, /* ODP
AT
_CONTROLLER action. */
+ DPIF_UC_ACTION, /* ODP
_ACTION_ATTR
_CONTROLLER action. */
DPIF_UC_SAMPLE, /* Packet sampling. */
DPIF_N_UC_TYPES
};
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. */
size_t key_len; /* Length of 'key' in bytes. */
/* DPIF_UC_ACTION only. */
- uint64_t userdata; /* Argument to ODP
AT
_CONTROLLER. */
+ uint64_t userdata; /* Argument to ODP
_ACTION_ATTR
_CONTROLLER. */
/* DPIF_UC_SAMPLE only. */
uint32_t sample_pool; /* # of sampling candidate packets so far. */
/* DPIF_UC_SAMPLE only. */
uint32_t sample_pool; /* # of sampling candidate packets so far. */