projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Use "OVS_*" as opposed to "ODP_*" for user<->kernel interactions.
[openvswitch]
/
lib
/
ofp-util.h
diff --git
a/lib/ofp-util.h
b/lib/ofp-util.h
index adad087d8c3bf21ae3bd08522cbf22f7cd75a732..b110d71667711abf53239bb0be779b0c35719dd0 100644
(file)
--- a/
lib/ofp-util.h
+++ b/
lib/ofp-util.h
@@
-122,7
+122,7
@@
struct ofpbuf *ofputil_make_set_flow_format(enum nx_flow_format);
struct ofpbuf *ofputil_make_flow_mod_table_id(bool flow_mod_table_id);
/* Flow format independent flow_mod. */
struct ofpbuf *ofputil_make_flow_mod_table_id(bool flow_mod_table_id);
/* Flow format independent flow_mod. */
-struct flow_mod {
+struct
ofputil_
flow_mod {
struct cls_rule cr;
ovs_be64 cookie;
uint8_t table_id;
struct cls_rule cr;
ovs_be64 cookie;
uint8_t table_id;
@@
-136,24
+136,24
@@
struct flow_mod {
size_t n_actions;
};
size_t n_actions;
};
-int ofputil_decode_flow_mod(struct
flow_mod *, const struct ofp_header
*,
- bool flow_mod_table_id);
-struct ofpbuf *ofputil_encode_flow_mod(const struct flow_mod *,
+int ofputil_decode_flow_mod(struct
ofputil_flow_mod
*,
+
const struct ofp_header *,
bool flow_mod_table_id);
+struct ofpbuf *ofputil_encode_flow_mod(const struct
ofputil_
flow_mod *,
enum nx_flow_format,
bool flow_mod_table_id);
/* Flow stats or aggregate stats request, independent of flow format. */
enum nx_flow_format,
bool flow_mod_table_id);
/* Flow stats or aggregate stats request, independent of flow format. */
-struct flow_stats_request {
+struct
ofputil_
flow_stats_request {
bool aggregate; /* Aggregate results? */
struct cls_rule match;
uint16_t out_port;
uint8_t table_id;
};
bool aggregate; /* Aggregate results? */
struct cls_rule match;
uint16_t out_port;
uint8_t table_id;
};
-int ofputil_decode_flow_stats_request(struct flow_stats_request *,
+int ofputil_decode_flow_stats_request(struct
ofputil_
flow_stats_request *,
const struct ofp_header *);
struct ofpbuf *ofputil_encode_flow_stats_request(
const struct ofp_header *);
struct ofpbuf *ofputil_encode_flow_stats_request(
- const struct flow_stats_request *, enum nx_flow_format);
+ const struct
ofputil_
flow_stats_request *, enum nx_flow_format);
/* Flow stats reply, independent of flow format. */
struct ofputil_flow_stats {
/* Flow stats reply, independent of flow format. */
struct ofputil_flow_stats {
@@
-301,7
+301,11
@@
enum ofputil_action_code {
OFPUTIL_NXAST_NOTE,
OFPUTIL_NXAST_SET_TUNNEL64,
OFPUTIL_NXAST_MULTIPATH,
OFPUTIL_NXAST_NOTE,
OFPUTIL_NXAST_SET_TUNNEL64,
OFPUTIL_NXAST_MULTIPATH,
- OFPUTIL_NXAST_AUTOPATH
+ OFPUTIL_NXAST_AUTOPATH,
+ OFPUTIL_NXAST_BUNDLE,
+ OFPUTIL_NXAST_BUNDLE_LOAD,
+ OFPUTIL_NXAST_RESUBMIT_TABLE,
+ OFPUTIL_NXAST_OUTPUT_REG
};
int ofputil_decode_action(const union ofp_action *);
};
int ofputil_decode_action(const union ofp_action *);
@@
-313,7
+317,8
@@
enum ofputil_action_code ofputil_decode_action_unsafe(
static inline union ofp_action *
ofputil_action_next(const union ofp_action *a)
{
static inline union ofp_action *
ofputil_action_next(const union ofp_action *a)
{
- return (void *) ((uint8_t *) a + ntohs(a->header.len));
+ return ((union ofp_action *) (void *)
+ ((uint8_t *) a + ntohs(a->header.len)));
}
static inline bool
}
static inline bool