struct ds;
struct flow;
struct flow_tnl;
+struct flow_wildcards;
struct nlattr;
struct ofpbuf;
struct simap;
-#define OVSP_NONE UINT32_MAX
+#define ODPP_LOCAL ODP_PORT_C(OVSP_LOCAL)
+#define ODPP_NONE ODP_PORT_C(UINT32_MAX)
void format_odp_actions(struct ds *, const struct nlattr *odp_actions,
size_t actions_len);
enum odp_key_fitness odp_tun_key_from_attr(const struct nlattr *,
struct flow_tnl *);
+void odp_flow_format(const struct nlattr *key, size_t key_len,
+ const struct nlattr *mask, size_t mask_len,
+ struct ds *);
void odp_flow_key_format(const struct nlattr *, size_t, struct ds *);
-int odp_flow_key_from_string(const char *s, const struct simap *port_names,
- struct ofpbuf *);
+int odp_flow_from_string(const char *s,
+ const struct simap *port_names,
+ struct ofpbuf *, struct ofpbuf *);
void odp_flow_key_from_flow(struct ofpbuf *, const struct flow *,
- uint32_t odp_in_port);
+ odp_port_t odp_in_port);
+void odp_flow_key_from_mask(struct ofpbuf *, const struct flow *mask,
+ const struct flow *flow, uint32_t odp_in_port);
uint32_t odp_flow_key_hash(const struct nlattr *, size_t);
void commit_odp_tunnel_action(const struct flow *, struct flow *base,
struct ofpbuf *odp_actions);
void commit_odp_actions(const struct flow *, struct flow *base,
- struct ofpbuf *odp_actions);
+ struct ofpbuf *odp_actions,
+ struct flow_wildcards *wc);
\f
/* ofproto-dpif interface.
*