renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-18 10:34:24 +08:00
Code

can: remove obsolete version strings

Browse Source 
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: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20201012074354.25839-2-socketcan@hartkopp.net
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Oliver Hartkopp 2020-10-12 09:43:54 +02:00 committed by Marc Kleine-Budde
parent ac911bfeb3
commit f726f3d371
8 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/can/core.h
View File

@ -18,13 +18,6 @@
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/netdevice.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") #define DNAME(dev) ((dev) ? (dev)->name : "any")
/** /**

1
include/net/netns/can.h
View File

@ -15,7 +15,6 @@ struct can_rcv_lists_stats;
struct netns_can { struct netns_can {
#if IS_ENABLED(CONFIG_PROC_FS) #if IS_ENABLED(CONFIG_PROC_FS)
struct proc_dir_entry *proc_dir; struct proc_dir_entry *proc_dir;
struct proc_dir_entry *pde_version;
struct proc_dir_entry *pde_stats; struct proc_dir_entry *pde_stats;
struct proc_dir_entry *pde_reset_stats; struct proc_dir_entry *pde_reset_stats;
struct proc_dir_entry *pde_rcvlist_all; struct proc_dir_entry *pde_rcvlist_all;

2
net/can/af_can.c
View File

@ -875,7 +875,7 @@ static __init int can_init(void)
offsetof(struct can_frame, data) != offsetof(struct can_frame, data) !=
offsetof(struct canfd_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), rcv_cache = kmem_cache_create("can_receiver", sizeof(struct receiver),
0, 0, NULL); 0, 0, NULL);

4
net/can/bcm.c
View File

@ -81,8 +81,6 @@
(CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \ (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \
(CAN_SFF_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_DESCRIPTION("PF_CAN broadcast manager protocol");
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_AUTHOR("Oliver Hartkopp <oliver.hartkopp@volkswagen.de>"); MODULE_AUTHOR("Oliver Hartkopp <oliver.hartkopp@volkswagen.de>");
@ -1696,7 +1694,7 @@ static int __init bcm_module_init(void)
{ {
int err; 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); err = can_proto_register(&bcm_can_proto);
if (err < 0) { if (err < 0) {

4
net/can/gw.c
View File

@ -59,7 +59,6 @@
#include <net/net_namespace.h> #include <net/net_namespace.h>
#include <net/sock.h> #include <net/sock.h>
#define CAN_GW_VERSION "20190810"
#define CAN_GW_NAME "can-gw" #define CAN_GW_NAME "can-gw"
MODULE_DESCRIPTION("PF_CAN netlink gateway"); MODULE_DESCRIPTION("PF_CAN netlink gateway");
@ -1194,8 +1193,7 @@ static __init int cgw_module_init(void)
/* sanitize given module parameter */ /* sanitize given module parameter */
max_hops = clamp_t(unsigned int, max_hops, CGW_MIN_HOPS, CGW_MAX_HOPS); 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", pr_info("can: netlink gateway - max_hops=%d\n", max_hops);
max_hops);
ret = register_pernet_subsys(&cangw_pernet_ops); ret = register_pernet_subsys(&cangw_pernet_ops);
if (ret) if (ret)

4
net/can/isotp.c
View File

@ -72,8 +72,6 @@
#include <net/sock.h> #include <net/sock.h>
#include <net/net_namespace.h> #include <net/net_namespace.h>
#define CAN_ISOTP_VERSION "20200928"
MODULE_DESCRIPTION("PF_CAN isotp 15765-2:2016 protocol"); MODULE_DESCRIPTION("PF_CAN isotp 15765-2:2016 protocol");
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_AUTHOR("Oliver Hartkopp <socketcan@hartkopp.net>"); MODULE_AUTHOR("Oliver Hartkopp <socketcan@hartkopp.net>");
@ -1408,7 +1406,7 @@ static __init int isotp_module_init(void)
{ {
int err; int err;
pr_info("can: isotp protocol (rev " CAN_ISOTP_VERSION ")\n"); pr_info("can: isotp protocol\n");
err = can_proto_register(&isotp_can_proto); err = can_proto_register(&isotp_can_proto);
if (err < 0) if (err < 0)

12
net/can/proc.c
View File

@ -54,7 +54,6 @@
* proc filenames for the PF_CAN core * proc filenames for the PF_CAN core
*/ */
#define CAN_PROC_VERSION "version"
#define CAN_PROC_STATS "stats" #define CAN_PROC_STATS "stats"
#define CAN_PROC_RESET_STATS "reset_stats" #define CAN_PROC_RESET_STATS "reset_stats"
#define CAN_PROC_RCVLIST_ALL "rcvlist_all" #define CAN_PROC_RCVLIST_ALL "rcvlist_all"
@ -293,12 +292,6 @@ static int can_reset_stats_proc_show(struct seq_file *m, void *v)
return 0; return 0;
} }
static int can_version_proc_show(struct seq_file *m, void *v)
{
seq_printf(m, "%s\n", CAN_VERSION_STRING);
return 0;
}
static inline void can_rcvlist_proc_show_one(struct seq_file *m, int idx, static inline void can_rcvlist_proc_show_one(struct seq_file *m, int idx,
struct net_device *dev, struct net_device *dev,
struct can_dev_rcv_lists *dev_rcv_lists) struct can_dev_rcv_lists *dev_rcv_lists)
@ -441,8 +434,6 @@ void can_init_proc(struct net *net)
} }
/* own procfs entries from the AF_CAN core */ /* own procfs entries from the AF_CAN core */
net->can.pde_version = proc_create_net_single(CAN_PROC_VERSION, 0644,
net->can.proc_dir, can_version_proc_show, NULL);
net->can.pde_stats = proc_create_net_single(CAN_PROC_STATS, 0644, net->can.pde_stats = proc_create_net_single(CAN_PROC_STATS, 0644,
net->can.proc_dir, can_stats_proc_show, NULL); net->can.proc_dir, can_stats_proc_show, NULL);
net->can.pde_reset_stats = proc_create_net_single(CAN_PROC_RESET_STATS, net->can.pde_reset_stats = proc_create_net_single(CAN_PROC_RESET_STATS,
@ -471,9 +462,6 @@ void can_init_proc(struct net *net)
*/ */
void can_remove_proc(struct net *net) void can_remove_proc(struct net *net)
{ {
if (net->can.pde_version)
remove_proc_entry(CAN_PROC_VERSION, net->can.proc_dir);
if (net->can.pde_stats) if (net->can.pde_stats)
remove_proc_entry(CAN_PROC_STATS, net->can.proc_dir); remove_proc_entry(CAN_PROC_STATS, net->can.proc_dir);

4
net/can/raw.c
View File

@ -55,8 +55,6 @@
#include <net/sock.h> #include <net/sock.h>
#include <net/net_namespace.h> #include <net/net_namespace.h>
#define CAN_RAW_VERSION CAN_VERSION
MODULE_DESCRIPTION("PF_CAN raw protocol"); MODULE_DESCRIPTION("PF_CAN raw protocol");
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_AUTHOR("Urs Thuermann <urs.thuermann@volkswagen.de>"); MODULE_AUTHOR("Urs Thuermann <urs.thuermann@volkswagen.de>");
@ -885,7 +883,7 @@ static __init int raw_module_init(void)
{ {
int err; int err;
pr_info("can: raw protocol (rev " CAN_RAW_VERSION ")\n"); pr_info("can: raw protocol\n");
err = can_proto_register(&raw_can_proto); err = can_proto_register(&raw_can_proto);
if (err < 0) if (err < 0)