Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf03a537 authored by Kurt Van Dijck's avatar Kurt Van Dijck Committed by Marc Kleine-Budde
Browse files

can: export a safe netdev_priv wrapper for candev 



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: default avatarKurt Van Dijck <kurt.van.dijck@eia.be>
Acked-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarFabio Baltieri <fabio.baltieri@gmail.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 996a953d

drivers/net/can/dev.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -794,6 +794,19 @@ void unregister_candev(struct net_device *dev) 
}

}

EXPORT_SYMBOL_GPL(unregister_candev);

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)

static __init int can_dev_init(void)

{

{

	int err;

	int err;

include/linux/can/dev.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -106,6 +106,9 @@ u8 can_len2dlc(u8 len); 
struct net_device *alloc_candev(int sizeof_priv, unsigned int echo_skb_max);

struct net_device *alloc_candev(int sizeof_priv, unsigned int echo_skb_max);

void free_candev(struct net_device *dev);

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);

int open_candev(struct net_device *dev);

void close_candev(struct net_device *dev);

void close_candev(struct net_device *dev);