Merge branch 'mainstream'

[sliver-openvswitch.git] / ofproto / ofproto-dpif-upcall.c

diff --git a/ofproto/ofproto-dpif-upcall.c b/ofproto/ofproto-dpif-upcall.c
index 78424fd..b57afdc 100644 (file)
--- a/ofproto/ofproto-dpif-upcall.c
+++ b/ofproto/ofproto-dpif-upcall.c
@@ -601,7 +601,7 @@ udpif_flow_dumper(void *arg)
         atomic_store(&udpif->flow_limit, flow_limit);
 
         if (duration > 2000) {
-            VLOG_WARN("Spent an unreasonably long %lldms dumping flows",
+            VLOG_INFO("Spent an unreasonably long %lldms dumping flows",
                       duration);
         }
 
@@ -1134,9 +1134,9 @@ handle_upcalls(struct handler *handler, struct list *upcalls)
 
             op = &ops[n_ops++];
             op->type = DPIF_OP_EXECUTE;
-            op->u.execute.key = miss->key;
-            op->u.execute.key_len = miss->key_len;
             op->u.execute.packet = packet;
+            odp_key_to_pkt_metadata(miss->key, miss->key_len,
+                                    &op->u.execute.md);
             op->u.execute.actions = miss->xout.odp_actions.data;
             op->u.execute.actions_len = miss->xout.odp_actions.size;
             op->u.execute.needs_help = (miss->xout.slow & SLOW_ACTION) != 0;