Merge branch 'mainstream'

[sliver-openvswitch.git] / datapath / vport-vxlan.c

diff --git a/datapath/vport-vxlan.c b/datapath/vport-vxlan.c
index a2cbeb9..4f9f339 100644 (file)
--- a/datapath/vport-vxlan.c
+++ b/datapath/vport-vxlan.c
@@ -267,6 +267,7 @@ static int vxlan_tunnel_setup(struct net *net, struct nlattr *options,
        if (vxlan_port) {
                vxlan_port->count++;
                err = 0;
+               *vxport = vxlan_port;
                goto out;
        }
 
@@ -371,9 +372,7 @@ const struct vport_ops ovs_vxlan_vport_ops = {
        .flags          = VPORT_F_TUN_ID,
        .create         = vxlan_tnl_create,
        .destroy        = vxlan_tnl_destroy,
-       .set_addr       = ovs_tnl_set_addr,
        .get_name       = ovs_tnl_get_name,
-       .get_addr       = ovs_tnl_get_addr,
        .get_options    = ovs_tnl_get_options,
        .set_options    = vxlan_set_options,
        .send           = ovs_tnl_send,