From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabio Baltieri Subject: [PATCH 8/9] can: export a safe netdev_priv wrapper for candev Date: Sun, 16 Dec 2012 12:08:32 +0100 Message-ID: <1355656113-9562-9-git-send-email-fabio.baltieri@gmail.com> References: <1355656113-9562-1-git-send-email-fabio.baltieri@gmail.com> Return-path: In-Reply-To: <1355656113-9562-1-git-send-email-fabio.baltieri@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: Marc Kleine-Budde , linux-can@vger.kernel.org Cc: Kurt Van Dijck , Wolfgang Grandegger , Oliver Hartkopp , linux-kernel@vger.kernel.org List-Id: linux-can.vger.kernel.org From: Kurt Van Dijck 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 Acked-by: Oliver Hartkopp --- 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