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;
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. */
-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;
};
-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 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 {
OFPUTIL_NXAST_SET_TUNNEL64,
OFPUTIL_NXAST_MULTIPATH,
OFPUTIL_NXAST_AUTOPATH,
- OFPUTIL_NXAST_BUNDLE
+ OFPUTIL_NXAST_BUNDLE,
+ OFPUTIL_NXAST_BUNDLE_LOAD,
+ OFPUTIL_NXAST_RESUBMIT_TABLE
};
int ofputil_decode_action(const union ofp_action *);
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