Merge "master" into "wdp".

[sliver-openvswitch.git] / datapath / tunnel.c

diff --git a/datapath/tunnel.c b/datapath/tunnel.c
index ad45228..c752fe8 100644 (file)
--- a/datapath/tunnel.c
+++ b/datapath/tunnel.c
@@ -892,7 +892,7 @@ static struct tnl_cache *build_cache(struct vport *vport,
                struct dp_port *dp_port;
                struct sk_buff *skb;
                bool is_frag;
-               struct odp_flow_key flow_key;
+               struct xflow_key flow_key;
                struct tbl_node *flow_node;
 
                vport = internal_dev_get_vport(rt_dst(rt).dev);