Commit 0177f0f0 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-next-for-6.19-20251129' of... 

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: default avatarJakub Kicinski <kuba@kernel.org>
parents ff736a28 cb2dc6d2

include/linux/can/dev.h

+7 −0
Original line number Diff line number Diff line
@@ -111,7 +111,14 @@ struct net_device *alloc_candev_mqs(int sizeof_priv, unsigned int echo_skb_max, 
void free_candev(struct net_device *dev);



/* a candev safe wrapper around netdev_priv */

#if IS_ENABLED(CONFIG_CAN_NETLINK)

struct can_priv *safe_candev_priv(struct net_device *dev);

#else

static inline struct can_priv *safe_candev_priv(struct net_device *dev)

{

	return NULL;

}

#endif



int open_candev(struct net_device *dev);

void close_candev(struct net_device *dev);

net/can/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


menuconfig CAN

	tristate "CAN bus subsystem support"

	select CAN_DEV

	help

	  Controller Area Network (CAN) is a slow (up to 1Mbit/s) serial

	  communications protocol. Development of the CAN bus started in