From 17ab01ce1117697d23a1bb832f17cb296aa8947a Mon Sep 17 00:00:00 2001 From: "sjur.brandeland@stericsson.com" Date: Wed, 1 Jun 2011 00:55:37 +0000 Subject: [PATCH] --- yaml --- r: 253054 b: refs/heads/master c: 41be5a4a3668810bf3687a76c2b017bd437039e0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/caif/chnl_net.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 65a9da546aba..0336bca2531a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85e3c65fa3a1d0542c181510a950a2be7733ff29 +refs/heads/master: 41be5a4a3668810bf3687a76c2b017bd437039e0 diff --git a/trunk/net/caif/chnl_net.c b/trunk/net/caif/chnl_net.c index 649ebacaf6bc..adbb424403d4 100644 --- a/trunk/net/caif/chnl_net.c +++ b/trunk/net/caif/chnl_net.c @@ -139,17 +139,14 @@ static void close_work(struct work_struct *work) struct chnl_net *dev = NULL; struct list_head *list_node; struct list_head *_tmp; - /* May be called with or without RTNL lock held */ - int islocked = rtnl_is_locked(); - if (!islocked) - rtnl_lock(); + + rtnl_lock(); list_for_each_safe(list_node, _tmp, &chnl_net_list) { dev = list_entry(list_node, struct chnl_net, list_field); if (dev->state == CAIF_SHUTDOWN) dev_close(dev->netdev); } - if (!islocked) - rtnl_unlock(); + rtnl_unlock(); } static DECLARE_WORK(close_worker, close_work);