lib/flow: Retain ODPP_NONE on flow_extract().

[sliver-openvswitch.git] / lib / packets.h

diff --git a/lib/packets.h b/lib/packets.h
index e6b3303..24d61a9 100644 (file)
--- a/lib/packets.h
+++ b/lib/packets.h
@@ -42,11 +42,9 @@ struct pkt_metadata {
 #define PKT_METADATA_INITIALIZER(PORT) \
     (struct pkt_metadata){ { 0, 0, 0, 0, 0, 0}, 0, 0, {(PORT)} }
 
-void pkt_metadata_init(struct pkt_metadata *md, const struct flow_tnl *tnl,
-                            const uint32_t skb_priority,
-                            const uint32_t pkt_mark,
-                            const union flow_in_port *in_port);
-void pkt_metadata_from_flow(struct pkt_metadata *md, const struct flow *flow);
+#define PKT_METADATA_INITIALIZER_FLOW(FLOW) \
+    (struct pkt_metadata){ (FLOW)->tunnel, (FLOW)->skb_priority, \
+            (FLOW)->pkt_mark, (FLOW)->in_port }
 
 bool dpid_from_string(const char *s, uint64_t *dpidp);