tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+8
+7
include/linux/can/dev.h
+7
include/linux/can/dev.h
···
111
111
void free_candev(struct net_device *dev);
112
112
113
113
/* a candev safe wrapper around netdev_priv */
114
+
#if IS_ENABLED(CONFIG_CAN_NETLINK)
114
115
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
115
122
116
123
int open_candev(struct net_device *dev);
117
124
void close_candev(struct net_device *dev);