can: Add SPDX license identifiers for CAN subsystem

Add missing SPDX identifiers for the CAN network layer and correct the SPDX
license for two of its include files to make sure the BSD-3-Clause applies
for the entire subsystem.

Signed-off-by: Oliver Hartkopp <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 f8284a94a13d5d828780d6b4fac95fdc8919e518..708c10d3417a9eff497b995ae498022cfd212ffc 100644 (file)
--- a/include/linux/can/core.h
+++ b/include/linux/can/core.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * linux/can/core.h
  *

diff --git a/include/linux/can/skb.h b/include/linux/can/skb.h
index b3379a97245c1f2169bfb08a9be17dccb81a6693..a954def26c0dd423b4a6065b6503b423c1b0a5b5 100644 (file)
--- a/include/linux/can/skb.h
+++ b/include/linux/can/skb.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * linux/can/skb.h
  *

diff --git a/net/can/af_can.c b/net/can/af_can.c
index 9c86de2da45e3095a848438bda941904c462a20d..76cf83b2bd409cae94c728573de8f248a6f29fc0 100644 (file)
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
 /*
  * af_can.c - Protocol family CAN core module
  *            (used by different CAN protocol modules)

diff --git a/net/can/af_can.h b/net/can/af_can.h
index 9cb3719632bddf5199e25c3936d80ec583420f73..ef21f7c6bc80ef817ab825fd893a9f8299e46df8 100644 (file)
--- a/net/can/af_can.h
+++ b/net/can/af_can.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
  * All rights reserved.

diff --git a/net/can/bcm.c b/net/can/bcm.c
index 1eecf4d3e8d2cc8d3ec8dfceeef9a58ce751ebfc..8da986b19d88c0e70ca608d1a303bfee11757188 100644 (file)
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
 /*
  * bcm.c - Broadcast Manager to filter/send (cyclic) CAN content
  *

diff --git a/net/can/gw.c b/net/can/gw.c
index 5275ddf580bc7d64139e323eca15e276357bfdd1..8abae841d5045974acf3e2634046c71ef66d422f 100644 (file)
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
 /*
  * gw.c - CAN frame Gateway/Router/Bridge with netlink interface
  *

diff --git a/net/can/proc.c b/net/can/proc.c
index 70fea17bb04c54a3aaac7cdc41d6ea2988610a46..edb822c31902c6d0f2ac39ead3d1bdf67cbf25cb 100644 (file)
--- a/net/can/proc.c
+++ b/net/can/proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
 /*
  * proc.c - procfs support for Protocol family CAN core module
  *

diff --git a/net/can/raw.c b/net/can/raw.c
index bbbe3dd0abe9b9218e1f0467a316329282f98f9c..ff720272f7b7f4c7a182e06a4ff089786d5f9937 100644 (file)
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
 /*
  * raw.c - Raw sockets for protocol family CAN
  *