aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/can/core.h2
-rw-r--r--include/linux/can/skb.h2
-rw-r--r--net/can/af_can.c1
-rw-r--r--net/can/af_can.h1
-rw-r--r--net/can/bcm.c1
-rw-r--r--net/can/gw.c1
-rw-r--r--net/can/proc.c1
-rw-r--r--net/can/raw.c1
8 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/can/core.h b/include/linux/can/core.h
index f8284a94a13d..708c10d3417a 100644
--- a/include/linux/can/core.h
+++ b/include/linux/can/core.h
@@ -1,4 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 */ 1/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
2/* 2/*
3 * linux/can/core.h 3 * linux/can/core.h
4 * 4 *
diff --git a/include/linux/can/skb.h b/include/linux/can/skb.h
index b3379a97245c..a954def26c0d 100644
--- a/include/linux/can/skb.h
+++ b/include/linux/can/skb.h
@@ -1,4 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 */ 1/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
2/* 2/*
3 * linux/can/skb.h 3 * linux/can/skb.h
4 * 4 *
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 9c86de2da45e..76cf83b2bd40 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
1/* 2/*
2 * af_can.c - Protocol family CAN core module 3 * af_can.c - Protocol family CAN core module
3 * (used by different CAN protocol modules) 4 * (used by different CAN protocol modules)
diff --git a/net/can/af_can.h b/net/can/af_can.h
index 9cb3719632bd..ef21f7c6bc80 100644
--- a/net/can/af_can.h
+++ b/net/can/af_can.h
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
1/* 2/*
2 * Copyright (c) 2002-2007 Volkswagen Group Electronic Research 3 * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
3 * All rights reserved. 4 * All rights reserved.
diff --git a/net/can/bcm.c b/net/can/bcm.c
index 1eecf4d3e8d2..8da986b19d88 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
1/* 2/*
2 * bcm.c - Broadcast Manager to filter/send (cyclic) CAN content 3 * bcm.c - Broadcast Manager to filter/send (cyclic) CAN content
3 * 4 *
diff --git a/net/can/gw.c b/net/can/gw.c
index 5275ddf580bc..8abae841d504 100644
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
1/* 2/*
2 * gw.c - CAN frame Gateway/Router/Bridge with netlink interface 3 * gw.c - CAN frame Gateway/Router/Bridge with netlink interface
3 * 4 *
diff --git a/net/can/proc.c b/net/can/proc.c
index 70fea17bb04c..edb822c31902 100644
--- a/net/can/proc.c
+++ b/net/can/proc.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
1/* 2/*
2 * proc.c - procfs support for Protocol family CAN core module 3 * proc.c - procfs support for Protocol family CAN core module
3 * 4 *
diff --git a/net/can/raw.c b/net/can/raw.c
index bbbe3dd0abe9..ff720272f7b7 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
1/* 2/*
2 * raw.c - Raw sockets for protocol family CAN 3 * raw.c - Raw sockets for protocol family CAN
3 * 4 *