Commit f726f3d3 authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by Marc Kleine-Budde
Browse files

can: remove obsolete version strings 

As pointed out by Jakub Kicinski here:
http://lore.kernel.org/r/20201009175751.5c54097f@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com


this patch removes the obsolete version information of the different
CAN protocols and the AF_CAN core module.

Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20201012074354.25839-2-socketcan@hartkopp.net


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

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;

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);

net/can/bcm.c

+1 −3
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ 
		     (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \

		     (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG))



#define CAN_BCM_VERSION "20170425"



MODULE_DESCRIPTION("PF_CAN broadcast manager protocol");

MODULE_LICENSE("Dual BSD/GPL");

MODULE_AUTHOR("Oliver Hartkopp <oliver.hartkopp@volkswagen.de>");
@@ -1696,7 +1694,7 @@ static int __init bcm_module_init(void) 
{

	int err;



	pr_info("can: broadcast manager protocol (rev " CAN_BCM_VERSION " t)\n");

	pr_info("can: broadcast manager protocol\n");



	err = can_proto_register(&bcm_can_proto);

	if (err < 0) {

net/can/gw.c

+1 −3
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 
#include <net/net_namespace.h>

#include <net/sock.h>



#define CAN_GW_VERSION "20190810"

#define CAN_GW_NAME "can-gw"



MODULE_DESCRIPTION("PF_CAN netlink gateway");
@@ -1194,8 +1193,7 @@ static __init int cgw_module_init(void) 
	/* sanitize given module parameter */

	max_hops = clamp_t(unsigned int, max_hops, CGW_MIN_HOPS, CGW_MAX_HOPS);



	pr_info("can: netlink gateway (rev " CAN_GW_VERSION ") max_hops=%d\n",

		max_hops);

	pr_info("can: netlink gateway - max_hops=%d\n",	max_hops);



	ret = register_pernet_subsys(&cangw_pernet_ops);

	if (ret)

CRA Git | Maintained and supported by SUSTech CRA and CCSE