leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-can-next-for-5.10-20201012

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCgAxFiEEK3kIWJt9yTYMP3ehqclaivrt76kFAl+EDvMTHG1rbEBwZW5n
 dXRyb25peC5kZQAKCRCpyVqK+u3vqU1TB/9uiELtngYqICr29XptMj/JWjPy56J+
 fBt/O93MG2WxYynqkJ2/9tMsxguDc5zwGcLGBcjW8gxJtpAW5vJ6/hfrcquLYjTj
 fFrkajCcjTzGn583Btq5kpd/fRy7pbFq3T1uj6dbBSuXTCqowpoE5r9rxDKDOq2W
 y7ttgpTa0EUJvbgZMVpEDZJ3gVyqDmZ0xR+gYQmUpkclUlFjCbRecB0CmGAGhnxF
 5eSx8GY5dqTL4S0ca5f1p0EmdCfFHTDjMDL/7e4pfkyzl6UY6Ir1Q4N8GEp/Ko12
 Y9j3wOr0pmEIZTbFcfB0234DLf1vHTENlxiKiitknzD4gW0Jahn5H5Yr
 =ljVH
 -----END PGP SIGNATURE-----

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: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2020-10-12 09:53:08 -07:00
commit 2ad119d998
10 changed files with 14 additions and 42 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/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")
/**

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

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

1
include/uapi/linux/can/isotp.h
View File

@ -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 */

3
net/can/Kconfig
View File

@ -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"

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

4
net/can/bcm.c
View File

@ -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) {

4
net/can/gw.c
View File

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

18
net/can/isotp.c
View File

@ -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>");
@ -222,8 +220,8 @@ static int isotp_send_fc(struct sock *sk, int ae, u8 flowstatus)
can_send_ret = can_send(nskb, 1);
if (can_send_ret)
printk_once(KERN_NOTICE "can-isotp: %s: can_send_ret %d\n",
__func__, can_send_ret);
pr_notice_once("can-isotp: %s: can_send_ret %d\n",
__func__, can_send_ret);
dev_put(dev);
@ -769,7 +767,7 @@ static enum hrtimer_restart isotp_tx_timer_handler(struct hrtimer *hrtimer)
isotp_tx_burst:
skb = alloc_skb(so->ll.mtu + sizeof(struct can_skb_priv),
gfp_any());
GFP_ATOMIC);
if (!skb) {
dev_put(dev);
break;
@ -798,8 +796,8 @@ isotp_tx_burst:
can_send_ret = can_send(skb, 1);
if (can_send_ret)
printk_once(KERN_NOTICE "can-isotp: %s: can_send_ret %d\n",
__func__, can_send_ret);
pr_notice_once("can-isotp: %s: can_send_ret %d\n",
__func__, can_send_ret);
if (so->tx.idx >= so->tx.len) {
/* we are done */
@ -942,8 +940,8 @@ static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
err = can_send(skb, 1);
dev_put(dev);
if (err) {
printk_once(KERN_NOTICE "can-isotp: %s: can_send_ret %d\n",
__func__, err);
pr_notice_once("can-isotp: %s: can_send_ret %d\n",
__func__, err);
return err;
}
@ -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)

12
net/can/proc.c
View File

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

4
net/can/raw.c
View File

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