datapath: compat: vxlan: fix udp-csum typo

[ovs.git] / datapath / vport-geneve.c

diff --git a/datapath/vport-geneve.c b/datapath/vport-geneve.c
index 3b5c1ab32e6befa43606b9eacdbb2743e4f4242a..5821ef481d85ea93c5fd5e0136f8dd63856329c8 100644 (file)
--- a/datapath/vport-geneve.c
+++ b/datapath/vport-geneve.c
@@ -34,7 +34,7 @@ static struct vport_ops ovs_geneve_vport_ops;
  * @dst_port: destination port.
  */
 struct geneve_port {
-       u16 port_no;
+       u16 dst_port;
 };
 
 static inline struct geneve_port *geneve_vport(const struct vport *vport)
@@ -47,23 +47,11 @@ static int geneve_get_options(const struct vport *vport,
 {
        struct geneve_port *geneve_port = geneve_vport(vport);
 
-       if (nla_put_u16(skb, OVS_TUNNEL_ATTR_DST_PORT, geneve_port->port_no))
+       if (nla_put_u16(skb, OVS_TUNNEL_ATTR_DST_PORT, geneve_port->dst_port))
                return -EMSGSIZE;
        return 0;
 }
 
-static int geneve_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
-                                     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(upcall, ovs_dp_get_net(vport->dp),
-                                         skb, IPPROTO_UDP, sport, dport);
-}
-
 static struct vport *geneve_tnl_create(const struct vport_parms *parms)
 {
        struct net *net = ovs_dp_get_net(parms->dp);
@@ -95,7 +83,7 @@ static struct vport *geneve_tnl_create(const struct vport_parms *parms)
                return vport;
 
        geneve_port = geneve_vport(vport);
-       geneve_port->port_no = dst_port;
+       geneve_port->dst_port = dst_port;
 
        rtnl_lock();
        dev = geneve_dev_create_fb(net, parms->name, NET_NAME_USER, dst_port);
@@ -128,9 +116,10 @@ static struct vport_ops ovs_geneve_vport_ops = {
        .create         = geneve_create,
        .destroy        = ovs_netdev_tunnel_destroy,
        .get_options    = geneve_get_options,
+#ifndef USE_UPSTREAM_TUNNEL
+       .fill_metadata_dst = geneve_fill_metadata_dst,
+#endif
        .send           = geneve_xmit,
-       .owner          = THIS_MODULE,
-       .get_egress_tun_info    = geneve_get_egress_tun_info,
 };
 
 static int __init ovs_geneve_tnl_init(void)