From 36c7751c9aa9d79204ea0cbbac71b4ad4ff67981 Mon Sep 17 00:00:00 2001
From: Kurt Van Dijck <kurt.van.dijck@eia.be>
Date: Tue, 18 Dec 2012 18:50:56 +0100
Subject: [PATCH] --- yaml --- r: 351684 b: refs/heads/master c:
 bf03a5379cd3492fbeca42111340581ba9dee0b8 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/net/can/dev.c   | 13 +++++++++++++
 trunk/include/linux/can/dev.h |  3 +++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 62bc39c67f97..0d046671b7dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 996a953de02ffb852c9ac736f4e892008ed68884
+refs/heads/master: bf03a5379cd3492fbeca42111340581ba9dee0b8
diff --git a/trunk/drivers/net/can/dev.c b/trunk/drivers/net/can/dev.c
index 8233e5ed2939..13e738098fbe 100644
--- a/trunk/drivers/net/can/dev.c
+++ b/trunk/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/trunk/include/linux/can/dev.h b/trunk/include/linux/can/dev.h
index 7747d9bcdc84..fb0ab651a041 100644
--- a/trunk/include/linux/can/dev.h
+++ b/trunk/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);