Commit f55a52bb authored by Vincent Mailhol's avatar Vincent Mailhol Committed by Marc Kleine-Budde
Browse files

can: dev: fix type of get_can_dlc() and get_canfd_dlc() macros 

The macros get_can_dlc() and get_canfd_dlc() are not visible in
userland. As such, type u8 should be preferred over type __u8.

Reference: https://lkml.org/lkml/2020/10/1/708


Signed-off-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/r/20201002154219.4887-3-mailhol.vincent@wanadoo.fr


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent eb88531b

include/linux/can/dev.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -84,13 +84,13 @@ struct can_priv { 




/*

/*

 * get_can_dlc(value) - helper macro to cast a given data length code (dlc)

 * get_can_dlc(value) - helper macro to cast a given data length code (dlc)

 * to __u8 and ensure the dlc value to be max. 8 bytes.

 * to u8 and ensure the dlc value to be max. 8 bytes.

 *

 *

 * To be used in the CAN netdriver receive path to ensure conformance with

 * To be used in the CAN netdriver receive path to ensure conformance with

 * ISO 11898-1 Chapter 8.4.2.3 (DLC field)

 * ISO 11898-1 Chapter 8.4.2.3 (DLC field)

 */

 */

#define get_can_dlc(i)		(min_t(__u8, (i), CAN_MAX_DLC))

#define get_can_dlc(i)		(min_t(u8, (i), CAN_MAX_DLC))

#define get_canfd_dlc(i)	(min_t(__u8, (i), CANFD_MAX_DLC))

#define get_canfd_dlc(i)	(min_t(u8, (i), CANFD_MAX_DLC))





/* Check for outgoing skbs that have not been created by the CAN subsystem */

/* Check for outgoing skbs that have not been created by the CAN subsystem */

static inline bool can_skb_headroom_valid(struct net_device *dev,

static inline bool can_skb_headroom_valid(struct net_device *dev,