Merge tag 'pinctrl-v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[firefly-linux-kernel-4.4.55.git] / net / openvswitch / vport-geneve.c

diff --git a/net/openvswitch/vport-geneve.c b/net/openvswitch/vport-geneve.c
index fa37c95f733947d06d04cec217995be8ca79196b..2735e9c4a3b88586165ef5644e429cf28079974d 100644 (file)
--- a/net/openvswitch/vport-geneve.c
+++ b/net/openvswitch/vport-geneve.c
@@ -53,17 +53,15 @@ static int geneve_get_options(const struct vport *vport,
 }
 
 static int geneve_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
-                                     struct ip_tunnel_info *egress_tun_info)
+                                     struct dp_upcall_info *upcall)
 {
        struct geneve_port *geneve_port = geneve_vport(vport);
        struct net *net = ovs_dp_get_net(vport->dp);
        __be16 dport = htons(geneve_port->port_no);
        __be16 sport = udp_flow_src_port(net, skb, 1, USHRT_MAX, true);
 
-       return ovs_tunnel_get_egress_info(egress_tun_info,
-                                         ovs_dp_get_net(vport->dp),
-                                         OVS_CB(skb)->egress_tun_info,
-                                         IPPROTO_UDP, skb->mark, sport, dport);
+       return ovs_tunnel_get_egress_info(upcall, ovs_dp_get_net(vport->dp),
+                                         skb, IPPROTO_UDP, sport, dport);
 }
 
 static struct vport *geneve_tnl_create(const struct vport_parms *parms)