Merge remote-tracking branch 'trivial/for-next'

[karo-tx-linux.git] / net / openvswitch / vport-geneve.c

diff --git a/net/openvswitch/vport-geneve.c b/net/openvswitch/vport-geneve.c
index 69f1de58a3b416713c9fcffc924ac606d13eebdb..1a1fcec8869593a8c99710e2021baa45ebfdedc8 100644 (file)
--- a/net/openvswitch/vport-geneve.c
+++ b/net/openvswitch/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,7 +47,7 @@ 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;
 }
@@ -83,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);
@@ -117,7 +117,6 @@ static struct vport_ops ovs_geneve_vport_ops = {
        .destroy        = ovs_netdev_tunnel_destroy,
        .get_options    = geneve_get_options,
        .send           = dev_queue_xmit,
-       .owner          = THIS_MODULE,
 };
 
 static int __init ovs_geneve_tnl_init(void)