git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Fix potential leak during flow mods.
[sliver-openvswitch.git]
/
lib
/
odp-util.h
diff --git
a/lib/odp-util.h
b/lib/odp-util.h
index
2b62614
..
0dfbcca
100644
(file)
--- a/
lib/odp-util.h
+++ b/
lib/odp-util.h
@@
-143,10
+143,11
@@
int odp_flow_from_string(const char *s,
const struct simap *port_names,
struct ofpbuf *, struct ofpbuf *);
const struct simap *port_names,
struct ofpbuf *, struct ofpbuf *);
-void odp_flow_key_from_flow(struct ofpbuf *, const struct flow *,
- odp_port_t odp_in_port);
+void odp_flow_key_from_flow(struct ofpbuf *, const struct flow *
flow
,
+
const struct flow *mask,
odp_port_t odp_in_port);
void odp_flow_key_from_mask(struct ofpbuf *, const struct flow *mask,
void odp_flow_key_from_mask(struct ofpbuf *, const struct flow *mask,
- const struct flow *flow, uint32_t odp_in_port);
+ const struct flow *flow, uint32_t odp_in_port,
+ size_t max_mpls_depth);
uint32_t odp_flow_key_hash(const struct nlattr *, size_t);
uint32_t odp_flow_key_hash(const struct nlattr *, size_t);
@@
-181,8
+182,7
@@
void commit_odp_tunnel_action(const struct flow *, struct flow *base,
enum slow_path_reason commit_odp_actions(const struct flow *,
struct flow *base,
struct ofpbuf *odp_actions,
enum slow_path_reason commit_odp_actions(const struct flow *,
struct flow *base,
struct ofpbuf *odp_actions,
- struct flow_wildcards *wc,
- int *mpls_depth_delta);
+ struct flow_wildcards *wc);
\f
/* ofproto-dpif interface.
*
\f
/* ofproto-dpif interface.
*