From: Fabio Baltieri <fabio.baltieri@gmail.com>
To: Marc Kleine-Budde <mkl@pengutronix.de>, linux-can@vger.kernel.org
Cc: Kurt Van Dijck <kurt.van.dijck@eia.be>,
Wolfgang Grandegger <wg@grandegger.com>,
Oliver Hartkopp <socketcan@hartkopp.net>,
linux-kernel@vger.kernel.org
Subject: [PATCH 8/9] can: export a safe netdev_priv wrapper for candev
Date: Sun, 16 Dec 2012 12:08:32 +0100 [thread overview]
Message-ID: <1355656113-9562-9-git-send-email-fabio.baltieri@gmail.com> (raw)
In-Reply-To: <1355656113-9562-1-git-send-email-fabio.baltieri@gmail.com>
From: Kurt Van Dijck <kurt.van.dijck@eia.be>
In net_device notifier calls, it was impossible to determine
if a CAN device is based on candev in a safe way.
This patch adds such test in order to access candev storage
from within those notifiers.
Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
---
drivers/net/can/dev.c | 13 +++++++++++++
include/linux/can/dev.h | 3 +++
2 files changed, 16 insertions(+)
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 8233e5e..13e7380 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -794,6 +794,19 @@ void unregister_candev(struct net_device *dev)
}
EXPORT_SYMBOL_GPL(unregister_candev);
+/*
+ * Test if a network device is a candev based device
+ * and return the can_priv* if so.
+ */
+struct can_priv *safe_candev_priv(struct net_device *dev)
+{
+ if ((dev->type != ARPHRD_CAN) || (dev->rtnl_link_ops != &can_link_ops))
+ return NULL;
+
+ return netdev_priv(dev);
+}
+EXPORT_SYMBOL_GPL(safe_candev_priv);
+
static __init int can_dev_init(void)
{
int err;
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index 7747d9b..fb0ab65 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -106,6 +106,9 @@ u8 can_len2dlc(u8 len);
struct net_device *alloc_candev(int sizeof_priv, unsigned int echo_skb_max);
void free_candev(struct net_device *dev);
+/* a candev safe wrapper around netdev_priv */
+struct can_priv *safe_candev_priv(struct net_device *dev);
+
int open_candev(struct net_device *dev);
void close_candev(struct net_device *dev);
--
1.7.12.1
next prev parent reply other threads:[~2012-12-16 11:08 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-16 11:08 [PATCH 0/9] tx/rx LED trigger support Fabio Baltieri
2012-12-16 11:08 ` [PATCH 1/9] can: add " Fabio Baltieri
2012-12-17 7:28 ` Bernd Krumboeck
2012-12-17 9:34 ` Kurt Van Dijck
2012-12-17 17:41 ` Fabio Baltieri
2012-12-17 20:20 ` "Bernd Krumböck"
2012-12-17 21:42 ` Fabio Baltieri
2012-12-18 6:02 ` "Bernd Krumböck"
2012-12-16 11:08 ` [PATCH 2/9] can: flexcan: add " Fabio Baltieri
2012-12-16 11:08 ` [PATCH 3/9] can: at91_can: " Fabio Baltieri
2012-12-16 11:08 ` [PATCH 4/9] can: ti_hecc: " Fabio Baltieri
2012-12-16 11:08 ` [PATCH 5/9] can: c_can: " Fabio Baltieri
2012-12-16 11:08 ` [PATCH 6/9] can: mcp251x: " Fabio Baltieri
2012-12-16 11:08 ` [PATCH 7/9] can: sja1000: " Fabio Baltieri
2012-12-16 11:08 ` Fabio Baltieri [this message]
2012-12-16 11:08 ` [PATCH 9/9] can: rename LED trigger name on netdev renames Fabio Baltieri
2012-12-16 22:37 ` [PATCH 0/9] tx/rx LED trigger support Marc Kleine-Budde
2012-12-16 22:51 ` Fabio Baltieri
2012-12-17 9:35 ` Kurt Van Dijck
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=1355656113-9562-9-git-send-email-fabio.baltieri@gmail.com \
--to=fabio.baltieri@gmail.com \
--cc=kurt.van.dijck@eia.be \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=socketcan@hartkopp.net \
--cc=wg@grandegger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.