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: 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>

diff --git a/include/linux/can/core.h b/include/linux/can/core.h
index 7da9f1f82e8eadffeada57d6c0c48a933f69a9d7..5fb8d0e3f9c1d027a2d5cd7c4eec7f2fa0340ed4 100644 (file)
--- a/include/linux/can/core.h
+++ b/include/linux/can/core.h
@@ -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")
 
 /**

diff --git a/include/net/netns/can.h b/include/net/netns/can.h
index b6ab7d1530d7e039ec42abe0d8207f05ea383eb6..52fbd8291a962ac10451bc6c07e6f5c21ab74bec 100644 (file)
--- a/include/net/netns/can.h
+++ b/include/net/netns/can.h
@@ -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;

diff --git a/net/can/af_can.c b/net/can/af_can.c
index b7d0f65008935d25f4f1f29ab24b8614c5e17928..6373ab9c5507c03f8eb127b00f1e404c9dfc15eb 100644 (file)
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -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);

diff --git a/net/can/bcm.c b/net/can/bcm.c
index 4253915800e6994ca250161c258b0ebd702c2c9a..0e5c37be4a2bd0a53afef34ab1805c18d768c72b 100644 (file)
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -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) {

diff --git a/net/can/gw.c b/net/can/gw.c
index 49b4e3d91ad654886c4bd13ee9a3e7f5948ca16e..6b790b6ff8d2653298535b71bd5aeabcd5a0b545 100644 (file)
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -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)

diff --git a/net/can/isotp.c b/net/can/isotp.c
index ca63061bb93238ab692e79a8385d32dcf6dad679..4c2062875893fd14c4c814bb8f787be75f6d1393 100644 (file)
--- a/net/can/isotp.c
+++ b/net/can/isotp.c
@@ -72,8 +72,6 @@
 #include <net/sock.h>
 #include <net/net_namespace.h>
 
-#define CAN_ISOTP_VERSION "20200928"
-
 MODULE_DESCRIPTION("PF_CAN isotp 15765-2:2016 protocol");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Oliver Hartkopp <socketcan@hartkopp.net>");
@@ -1408,7 +1406,7 @@ static __init int isotp_module_init(void)
 {
        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);
        if (err < 0)

diff --git a/net/can/proc.c b/net/can/proc.c
index a4eb06c9eb708014b038832ab472e20b43e54791..550928b8b8a2c988270411ffdad80ab1f5b9dc03 100644 (file)
--- a/net/can/proc.c
+++ b/net/can/proc.c
@@ -54,7 +54,6 @@
  * proc filenames for the PF_CAN core
  */
 
-#define CAN_PROC_VERSION     "version"
 #define CAN_PROC_STATS       "stats"
 #define CAN_PROC_RESET_STATS "reset_stats"
 #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;
 }
 
-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,
                                             struct net_device *dev,
                                             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 */
-       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.proc_dir, can_stats_proc_show, NULL);
        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)
 {
-       if (net->can.pde_version)
-               remove_proc_entry(CAN_PROC_VERSION, net->can.proc_dir);
-
        if (net->can.pde_stats)
                remove_proc_entry(CAN_PROC_STATS, net->can.proc_dir);
 

diff --git a/net/can/raw.c b/net/can/raw.c
index ea70850f91529263b102b71c333c70fc1256fab4..6ec8aa1d0da4600bf9f893cea07da4c12c8f7001 100644 (file)
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -55,8 +55,6 @@
 #include <net/sock.h>
 #include <net/net_namespace.h>
 
-#define CAN_RAW_VERSION CAN_VERSION
-
 MODULE_DESCRIPTION("PF_CAN raw protocol");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Urs Thuermann <urs.thuermann@volkswagen.de>");
@@ -885,7 +883,7 @@ static __init int raw_module_init(void)
 {
        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);
        if (err < 0)