[ovs-dev] [PATCHv4] odp-util: Always serialise recirculation in upcall key.

[Joe Stringer]

Pushed to master with the following incremental:

diff --git a/lib/odp-util.c b/lib/odp-util.c
index 37ec2be..280e8a6 100644
--- a/lib/odp-util.c
+++ b/lib/odp-util.c
@@ -2483,8 +2483,7 @@ ovs_to_odp_frag_mask(uint8_t nw_frag_mask)
 static void
 odp_flow_key_from_flow__(struct ofpbuf *buf, const struct flow *flow,
                          const struct flow *mask, odp_port_t odp_in_port,
-                         size_t max_mpls_depth, bool export_mask,
-                         bool recirc)
+                         size_t max_mpls_depth, bool recirc, bool
export_mask)
 {
     struct ovs_key_ethernet *eth_key;
     size_t encap;
@@ -2681,8 +2680,8 @@ odp_flow_key_from_flow(struct ofpbuf *buf, const
struct flow *flow,
                        const struct flow *mask, odp_port_t odp_in_port,
                        bool recirc)
 {
-    odp_flow_key_from_flow__(buf, flow, mask, odp_in_port, SIZE_MAX, false,
-                             recirc);
+    odp_flow_key_from_flow__(buf, flow, mask, odp_in_port, SIZE_MAX,
recirc,
+                             false);
 }

 /* Appends a representation of 'mask' as OVS_KEY_ATTR_* attributes to
@@ -2702,7 +2701,7 @@ odp_flow_key_from_mask(struct ofpbuf *buf, const
struct flow *mask,
                        size_t max_mpls_depth, bool recirc)
 {
     odp_flow_key_from_flow__(buf, flow, mask, u32_to_odp(odp_in_port_mask),
-                             max_mpls_depth, true, recirc);
+                             max_mpls_depth, recirc, true);
 }

 /* Generate ODP flow key from the given packet metadata */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openvswitch.org/pipermail/ovs-dev/attachments/20140519/af0a4147/attachment-0005.html>