Signed-off-by: Simon Horman <ho...@verge.net.au>
---
v7
* Manual rebase
v6
* No change
v5
* Manual rebase
v4
* No change
v3
* No change
v2
* No change
Conflicts:
lib/ofp-util.c
---
lib/ofp-util.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index 74016e5..d0eb72c 100644
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -1170,7 +1170,10 @@ ofputil_decode_flow_mod(struct ofputil_flow_mod *fm,
ofm = ofpbuf_pull(&b, sizeof *ofm);
- error = ofputil_pull_ofp11_match(&b, ntohs(ofm->priority), &fm->cr);
+ error = __ofputil_pull_ofp11_match(&b, ntohs(ofm->priority),
+ &fm->cr, &fm->cookie,
+ &fm->cookie_mask, NULL,
+ oh->version);
if (error) {
return error;
}
--
1.7.10.2.484.gcd07cc5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
