From: Ying Xue <ying.xue@windriver.com>
To: <davem@davemloft.net>
Cc: <vfalico@redhat.com>, <john.r.fastabend@intel.com>,
<stephen@networkplumber.org>, <antonio@meshcoding.com>,
<dmitry.tarnyagin@lockless.no>, <socketcan@hartkopp.net>,
<johannes@sipsolutions.net>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH net-next 01/10] Drivers: Staging: cxt1e1: use __dev_get_name instead of dev_get_name to find interfaces
Date: Tue, 14 Jan 2014 15:41:00 +0800 [thread overview]
Message-ID: <1389685269-18600-2-git-send-email-ying.xue@windriver.com> (raw)
In-Reply-To: <1389685269-18600-1-git-send-email-ying.xue@windriver.com>
The following call chain denotes that both do_reset() and do_del_chan()
are protected under rtnl_lock. If we use __dev_get_by_name() instead of
dev_get_by_name() to find interface handlers in them, this would help
us avoid to change interface reference counter.
dev_ioctl()
rtnl_lock()
dev_ifsioc()
c4_ioctl()
do_reset()
do_del_chan()
Signed-off-by: Ying Xue <ying.xue@windriver.com>
---
drivers/staging/cxt1e1/linux.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c
index 9b48373..4a08e16 100644
--- a/drivers/staging/cxt1e1/linux.c
+++ b/drivers/staging/cxt1e1/linux.c
@@ -770,9 +770,9 @@ do_del_chan (struct net_device *musycc_dev, void *data)
if (cp.channum > 999)
return -EINVAL;
snprintf (buf, sizeof(buf), CHANNAME "%d", cp.channum);
- if (!(dev = dev_get_by_name (&init_net, buf)))
- return -ENOENT;
- dev_put (dev);
+ dev = __dev_get_by_name(&init_net, buf);
+ if (!dev)
+ return -ENODEV;
ret = do_deluser (dev, 1);
if (ret)
return ret;
@@ -792,19 +792,18 @@ do_reset (struct net_device *musycc_dev, void *data)
char buf[sizeof (CHANNAME) + 3];
sprintf (buf, CHANNAME "%d", i);
- if (!(ndev = dev_get_by_name(&init_net, buf)))
- continue;
+ ndev = __dev_get_by_name(&init_net, buf);
+ if (!ndev)
+ continue;
priv = dev_to_hdlc (ndev)->priv;
if ((unsigned long) (priv->ci) ==
(unsigned long) (netdev_priv(musycc_dev)))
{
ndev->flags &= ~IFF_UP;
- dev_put (ndev);
netif_stop_queue (ndev);
do_deluser (ndev, 1);
- } else
- dev_put (ndev);
+ }
}
return 0;
}
--
1.7.9.5
next prev parent reply other threads:[~2014-01-14 7:41 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-14 7:40 [PATCH net-next 00/10] use appropriate APIs to get interfaces Ying Xue
2014-01-14 7:41 ` Ying Xue [this message]
2014-01-14 7:41 ` [PATCH net-next 02/10] bonding: use __dev_get_by_name instead of dev_get_by_name to find interface Ying Xue
2014-01-14 11:55 ` Veaceslav Falico
2014-01-14 7:41 ` [PATCH net-next 03/10] eql: " Ying Xue
2014-01-14 7:41 ` [PATCH net-next 04/10] dcb: " Ying Xue
2014-01-14 7:41 ` [PATCH net-next 05/10] decnet: use __dev_get_by_index instead of dev_get_by_index " Ying Xue
2014-01-14 7:41 ` [PATCH net-next 06/10] vxlan: " Ying Xue
2014-01-14 16:51 ` Stephen Hemminger
2014-01-14 7:41 ` [PATCH net-next 07/10] batman-adv: " Ying Xue
2014-01-14 12:43 ` Antonio Quartulli
2014-01-14 7:41 ` [PATCH net-next 08/10] caif: " Ying Xue
2014-01-14 7:41 ` [PATCH net-next 09/10] can: use " Ying Xue
2014-01-14 16:11 ` Oliver Hartkopp
2014-01-14 7:41 ` [PATCH net-next 10/10] net: nl80211: " Ying Xue
2014-01-14 12:11 ` Johannes Berg
2014-01-15 1:18 ` Ying Xue
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1389685269-18600-2-git-send-email-ying.xue@windriver.com \
--to=ying.xue@windriver.com \
--cc=antonio@meshcoding.com \
--cc=davem@davemloft.net \
--cc=dmitry.tarnyagin@lockless.no \
--cc=johannes@sipsolutions.net \
--cc=john.r.fastabend@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=socketcan@hartkopp.net \
--cc=stephen@networkplumber.org \
--cc=vfalico@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).