@@ -129,7 +129,6 @@ static struct vport_ops ovs_geneve_vport_ops = {
.destroy = ovs_netdev_tunnel_destroy,
.get_options = geneve_get_options,
.send = geneve_xmit,
- .owner = THIS_MODULE,
.get_egress_tun_info = geneve_get_egress_tun_info,
};
@@ -97,7 +97,6 @@ static struct vport_ops ovs_gre_vport_ops = {
.send = gre_fb_xmit,
.get_egress_tun_info = gre_get_egress_tun_info,
.destroy = ovs_netdev_tunnel_destroy,
- .owner = THIS_MODULE,
};
static int __init ovs_gre_tnl_init(void)
@@ -129,7 +129,6 @@ static struct vport_ops ovs_lisp_vport_ops = {
.destroy = ovs_netdev_tunnel_destroy,
.get_options = lisp_get_options,
.send = lisp_xmit,
- .owner = THIS_MODULE,
.get_egress_tun_info = lisp_get_egress_tun_info,
};
@@ -131,7 +131,6 @@ static struct vport_ops ovs_stt_vport_ops = {
.destroy = ovs_netdev_tunnel_destroy,
.get_options = stt_get_options,
.send = ovs_stt_xmit,
- .owner = THIS_MODULE,
.get_egress_tun_info = stt_get_egress_tun_info,
};
@@ -113,7 +113,7 @@ static struct hlist_head *hash_bucket(const struct net *net, const char *name)
return &dev_table[hash & (VPORT_HASH_BUCKETS - 1)];
}
-int ovs_vport_ops_register(struct vport_ops *ops)
+int __ovs_vport_ops_register(struct vport_ops *ops)
{
int err = -EEXIST;
struct vport_ops *o;
@@ -129,7 +129,7 @@ errout:
ovs_unlock();
return err;
}
-EXPORT_SYMBOL_GPL(ovs_vport_ops_register);
+EXPORT_SYMBOL_GPL(__ovs_vport_ops_register);
void ovs_vport_ops_unregister(struct vport_ops *ops)
{
@@ -212,7 +212,13 @@ static inline const char *ovs_vport_name(struct vport *vport)
return vport->dev->name;
}
-int ovs_vport_ops_register(struct vport_ops *ops);
+int __ovs_vport_ops_register(struct vport_ops *ops);
+#define ovs_vport_ops_register(ops) \
+({ \
+ (ops)->owner = THIS_MODULE; \
+ __ovs_vport_ops_register(ops); \
+})
+
void ovs_vport_ops_unregister(struct vport_ops *ops);
static inline struct rtable *ovs_tunnel_route_lookup(struct net *net,