---

yaml --- r: 233085 b: refs/heads/master c: b2df5a8 h: refs/heads/master i: 233083: de46bf3 v: v3
git-mirror · Feb 8, 2011 · 88029b7 · 88029b7
1 parent c123565
commit 88029b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84e77a8bc73cad2f910cc981f266904c66a17825
+refs/heads/master: b2df5a8446e135f7648736b8bec8179c88ce360d
diff --git a/trunk/net/caif/chnl_net.c b/trunk/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;
 }