1 files changed, 15 insertions, 2 deletions

diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
index 84516126e5f3..10dc07e1678b 100644
--- a/net/openvswitch/vport-internal_dev.c
+++ b/net/openvswitch/vport-internal_dev.c
@@ -36,6 +36,8 @@ struct internal_dev {
         struct vport *vport;
 };
 
+static struct vport_ops ovs_internal_vport_ops;
+
 static struct internal_dev *internal_dev_priv(struct net_device *netdev)
 {
         return netdev_priv(netdev);
@@ -238,7 +240,7 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
         return len;
 }
 
-const struct vport_ops ovs_internal_vport_ops = {
+static struct vport_ops ovs_internal_vport_ops = {
         .type           = OVS_VPORT_TYPE_INTERNAL,
         .create         = internal_dev_create,
         .destroy        = internal_dev_destroy,
@@ -261,10 +263,21 @@ struct vport *ovs_internal_dev_get_vport(struct net_device *netdev)
 
 int ovs_internal_dev_rtnl_link_register(void)
 {
-        return rtnl_link_register(&internal_dev_link_ops);
+        int err;
+
+        err = rtnl_link_register(&internal_dev_link_ops);
+        if (err < 0)
+                return err;
+
+        err = ovs_vport_ops_register(&ovs_internal_vport_ops);
+        if (err < 0)
+                rtnl_link_unregister(&internal_dev_link_ops);
+
+        return err;
 }
 
 void ovs_internal_dev_rtnl_link_unregister(void)
 {
+        ovs_vport_ops_unregister(&ovs_internal_vport_ops);
         rtnl_link_unregister(&internal_dev_link_ops);
 }