Skip to content

Commit 0177f0f

Browse files
committed
Merge tag 'linux-can-next-for-6.19-20251129' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says: ==================== pull-request: can-next 2025-11-29 The patch is by Oliver Hartkopp and fixes the compilation of the CAN_RAW protocol if the CAN driver infrastructure is not enabled. This problem was introduced in the current development cycle of net-next. * tag 'linux-can-next-for-6.19-20251129' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next: can: Kconfig: select CAN driver infrastructure by default ==================== Link: https://patch.msgid.link/20251129125036.467177-1-mkl@pengutronix.de Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 parents ff736a2 + cb2dc6d commit 0177f0f

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

include/linux/can/dev.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,14 @@ struct net_device *alloc_candev_mqs(int sizeof_priv, unsigned int echo_skb_max,
111111
void free_candev(struct net_device *dev);
112112

113113
/* a candev safe wrapper around netdev_priv */
114+
#if IS_ENABLED(CONFIG_CAN_NETLINK)
114115
struct can_priv *safe_candev_priv(struct net_device *dev);
116+
#else
117+
static inline struct can_priv *safe_candev_priv(struct net_device *dev)
118+
{
119+
return NULL;
120+
}
121+
#endif
115122

116123
int open_candev(struct net_device *dev);
117124
void close_candev(struct net_device *dev);

net/can/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
menuconfig CAN
77
tristate "CAN bus subsystem support"
8+
select CAN_DEV
89
help
910
Controller Area Network (CAN) is a slow (up to 1Mbit/s) serial
1011
communications protocol. Development of the CAN bus started in

0 commit comments

Comments
 (0)