1 files changed, 20 insertions, 1 deletions

diff --git a/net/openvswitch/vport-geneve.c b/net/openvswitch/vport-geneve.c
index 70c9765011f4..e31f19c922e2 100644
--- a/net/openvswitch/vport-geneve.c
+++ b/net/openvswitch/vport-geneve.c
@@ -97,7 +97,9 @@ static void geneve_rcv(struct geneve_sock *gs, struct sk_buff *skb)
 
         key = vni_to_tunnel_id(geneveh->vni);
 
-        ovs_flow_tun_info_init(&tun_info, ip_hdr(skb), key, flags,
+        ovs_flow_tun_info_init(&tun_info, ip_hdr(skb),
+                               udp_hdr(skb)->source, udp_hdr(skb)->dest,
+                               key, flags,
                                geneveh->options, opts_len);
 
         ovs_vport_receive(vport, skb, &tun_info);
@@ -228,6 +230,22 @@ static const char *geneve_get_name(const struct vport *vport)
         return geneve_port->name;
 }
 
+static int geneve_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
+                                      struct ovs_tunnel_info *egress_tun_info)
+{
+        struct geneve_port *geneve_port = geneve_vport(vport);
+        struct net *net = ovs_dp_get_net(vport->dp);
+        __be16 dport = inet_sk(geneve_port->gs->sock->sk)->inet_sport;
+        __be16 sport = udp_flow_src_port(net, skb, 1, USHRT_MAX, true);
+
+        /* Get tp_src and tp_dst, refert to geneve_build_header().
+         */
+        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);
+}
+
 static struct vport_ops ovs_geneve_vport_ops = {
         .type           = OVS_VPORT_TYPE_GENEVE,
         .create         = geneve_tnl_create,
@@ -236,6 +254,7 @@ static struct vport_ops ovs_geneve_vport_ops = {
         .get_options    = geneve_get_options,
         .send           = geneve_tnl_send,
         .owner          = THIS_MODULE,
+        .get_egress_tun_info    = geneve_get_egress_tun_info,
 };
 
 static int __init ovs_geneve_tnl_init(void)