Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[cascardo/linux.git] / net / openvswitch / vport-vxlan.c

diff --git a/net/openvswitch/vport-vxlan.c b/net/openvswitch/vport-vxlan.c
index ed7b23f..c11413d 100644 (file)
--- a/net/openvswitch/vport-vxlan.c
+++ b/net/openvswitch/vport-vxlan.c
@@ -147,7 +147,7 @@ static struct vport *vxlan_create(const struct vport_parms *parms)
 }
 
 static int vxlan_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
-                                    struct ip_tunnel_info *egress_tun_info)
+                                    struct dp_upcall_info *upcall)
 {
        struct vxlan_dev *vxlan = netdev_priv(vport->dev);
        struct net *net = ovs_dp_get_net(vport->dp);
@@ -159,7 +159,7 @@ static int vxlan_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
        inet_get_local_port_range(net, &port_min, &port_max);
        src_port = udp_flow_src_port(net, skb, 0, 0, true);
 
-       return ovs_tunnel_get_egress_info(egress_tun_info, net,
+       return ovs_tunnel_get_egress_info(upcall, net,
                                          skb, IPPROTO_UDP,
                                          src_port, dst_port);
 }