From 88029b7ef4037e1fdc9664ec6b5b0b9d4276f41f Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 8 Feb 2011 14:31:31 -0800 Subject: [PATCH] --- yaml --- r: 233085 b: refs/heads/master c: b2df5a8446e135f7648736b8bec8179c88ce360d h: refs/heads/master i: 233083: de46bf3e63ade4c4a6eac8ac827c3e3712763497 v: v3 --- [refs] | 2 +- trunk/net/caif/chnl_net.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c41dd43bba5a..69d192a0c2c5 100644 --- 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 index fa9dab372b68..6008d6dc18a0 100644 --- 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; }