Merge branch 'sh/st-integration' into sh/urgent

1 files changed, 2 insertions, 2 deletions

diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
index fa9dab372b68..6008d6dc18a0 100644
--- a/net/caif/chnl_net.c
+++ b/net/caif/chnl_net.c
@@ -394,9 +394,7 @@ static void ipcaif_net_setup(struct net_device *dev)
         priv->conn_req.sockaddr.u.dgm.connection_id = -1;
         priv->flowenabled = false;
 
-        ASSERT_RTNL();
         init_waitqueue_head(&priv->netmgmt_wq);
-        list_add(&priv->list_field, &chnl_net_list);
 }
 
 
@@ -453,6 +451,8 @@ static int ipcaif_newlink(struct net *src_net, struct net_device *dev,
         ret = register_netdevice(dev);
         if (ret)
                 pr_warn("device rtml registration failed\n");
+        else
+                list_add(&caifdev->list_field, &chnl_net_list);
         return ret;
 }