mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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>,
	Bernd Krumboeck <b.krumboeck@gmail.com>,
	linux-kernel@vger.kernel.org,
	Fabio Baltieri <fabio.baltieri@gmail.com>
Subject: [PATCH 02/10] can: export a safe netdev_priv wrapper for candev
Date: Tue, 18 Dec 2012 18:50:56 +0100	[thread overview]
Message-ID: <1355853064-18144-3-git-send-email-fabio.baltieri@gmail.com> (raw)
In-Reply-To: <1355853064-18144-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>
Signed-off-by: Fabio Baltieri <fabio.baltieri@gmail.com>
---
 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


  parent reply	other threads:[~2012-12-18 18:00 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-18 17:50 [PATCH v2 00/10] tx/rx LED trigger support Fabio Baltieri
2012-12-18 17:50 ` [PATCH 01/10] can: add " Fabio Baltieri
2012-12-18 17:50 ` Fabio Baltieri [this message]
2012-12-18 17:50 ` [PATCH 03/10] can: rename LED trigger name on netdev renames Fabio Baltieri
2012-12-18 17:50 ` [PATCH 04/10] can: flexcan: add LED trigger support Fabio Baltieri
2012-12-18 17:50 ` [PATCH 05/10] can: at91_can: " Fabio Baltieri
2012-12-18 17:51 ` [PATCH 06/10] can: ti_hecc: " Fabio Baltieri
2012-12-18 17:51 ` [PATCH 07/10] can: c_can: " Fabio Baltieri
2012-12-18 17:51 ` [PATCH 08/10] can: mcp251x: " Fabio Baltieri
2012-12-18 17:51 ` [PATCH 09/10] can: sja1000: " Fabio Baltieri
2012-12-18 17:51 ` [PATCH 10/10] can: usb_8dev: " Fabio Baltieri
2013-01-15 20:41 ` [PATCH v2 00/10] tx/rx " Marc Kleine-Budde
2013-01-22 21:39   ` Marc Kleine-Budde
2013-01-22 21:55   ` Marc Kleine-Budde
2013-01-22 22:53     ` Fabio Baltieri

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=1355853064-18144-3-git-send-email-fabio.baltieri@gmail.com \
    --to=fabio.baltieri@gmail.com \
    --cc=b.krumboeck@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®