Commit 2ad119d9 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-next-for-5.10-20201012' of... 

Merge tag 'linux-can-next-for-5.10-20201012' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next



Marc Kleine-Budde says:

====================
linux-can-next-for-5.10-20201012

Both patches are by Oliver Hartkopp, the first one addresses Jakub's review
comments of the ISOTP protocol, the other one removes version strings from
various CAN protocols.
====================

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 15f5e48f f726f3d3

include/linux/can/core.h

+0 −7
Original line number Diff line number Diff line
@@ -18,13 +18,6 @@ 
#include <linux/skbuff.h>

#include <linux/netdevice.h>



#define CAN_VERSION "20170425"



/* increment this number each time you change some user-space interface */

#define CAN_ABI_VERSION "9"



#define CAN_VERSION_STRING "rev " CAN_VERSION " abi " CAN_ABI_VERSION



#define DNAME(dev) ((dev) ? (dev)->name : "any")



/**

include/net/netns/can.h

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ struct can_rcv_lists_stats; 
struct netns_can {

#if IS_ENABLED(CONFIG_PROC_FS)

	struct proc_dir_entry *proc_dir;

	struct proc_dir_entry *pde_version;

	struct proc_dir_entry *pde_stats;

	struct proc_dir_entry *pde_reset_stats;

	struct proc_dir_entry *pde_rcvlist_all;

include/uapi/linux/can/isotp.h

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ struct can_isotp_ll_options { 
 * these default settings can be changed via sockopts.

 * For that reason the STmin value is intentionally _not_ checked for

 * consistency and copied directly into the flow control (FC) frame.

 *

 */



#endif /* !_UAPI_CAN_ISOTP_H */

net/can/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ source "net/can/j1939/Kconfig" 


config CAN_ISOTP

	tristate "ISO 15765-2:2016 CAN transport protocol"

	default y

	help

	  CAN Transport Protocols offer support for segmented Point-to-Point

	  communication between CAN nodes via two defined CAN Identifiers.
@@ -67,6 +66,8 @@ config CAN_ISOTP 
	  vehicle diagnosis (UDS, ISO 14229) or IP-over-CAN traffic.

	  This protocol driver implements data transfers according to

	  ISO 15765-2:2016 for 'classic' CAN and CAN FD frame types.

	  If you want to perform automotive vehicle diagnostic services (UDS),

	  say 'y'.



source "drivers/net/can/Kconfig"

net/can/af_can.c

+1 −1
Original line number Diff line number Diff line
@@ -875,7 +875,7 @@ static __init int can_init(void) 
		     offsetof(struct can_frame, data) !=

		     offsetof(struct canfd_frame, data));



	pr_info("can: controller area network core (" CAN_VERSION_STRING ")\n");

	pr_info("can: controller area network core\n");



	rcv_cache = kmem_cache_create("can_receiver", sizeof(struct receiver),

				      0, 0, NULL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE