llc: Add SPDX id lines to some llc source files

Most of the lls source files are missing SPDX-License-Identifier
lines.  Add appropriate IDs to these files, and remove other license
info from the header.  In once case, leave the existing id line
and just remove the license reference text.

Signed-off-by: Tim Bird <tim.bird@sony.com>
Link: https://patch.msgid.link/20260522225508.24006-1-tim.bird@sony.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/linux/llc.h b/include/linux/llc.h
index b965314d017f546d09a5064fdf313b9893b52327..944e9e213112f1de090dfd73c13766a910b884b8 100644 (file)
--- a/include/linux/llc.h
+++ b/include/linux/llc.h
@@ -1,14 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * IEEE 802.2 User Interface SAPs for Linux, data structures and indicators.
  *
  * Copyright (c) 2001 by Jay Schulist <jschlst@samba.org>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 #ifndef __LINUX_LLC_H
 #define __LINUX_LLC_H

diff --git a/include/net/llc.h b/include/net/llc.h
index e250dca03963bf14750d16ebf1cb6d976b7206d3..029ba8a22319ca6c38a185e11b1f4d2326217651 100644 (file)
--- a/include/net/llc.h
+++ b/include/net/llc.h
@@ -1,15 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LLC_H
 #define LLC_H
 /*
  * Copyright (c) 1997 by Procom Technology, Inc.
  *              2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 
 #include <linux/if.h>

diff --git a/include/uapi/linux/llc.h b/include/uapi/linux/llc.h
index cf8806b14d5fc9497a8d139591fff8a044c4bd38..2ffd81f9cc01aaec6317026c62fdea0e37f7bc90 100644 (file)
--- a/include/uapi/linux/llc.h
+++ b/include/uapi/linux/llc.h
@@ -3,13 +3,6 @@
  * IEEE 802.2 User Interface SAPs for Linux, data structures and indicators.
  *
  * Copyright (c) 2001 by Jay Schulist <jschlst@samba.org>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 #ifndef _UAPI__LINUX_LLC_H
 #define _UAPI__LINUX_LLC_H

diff --git a/net/llc/Makefile b/net/llc/Makefile
index 5e0ef436daaefbb623c056bffc8cee765b160c59..46b1cd905ffd5b7ed2bc4e13aab64ce145f2c35f 100644 (file)
--- a/net/llc/Makefile
+++ b/net/llc/Makefile
@@ -1,15 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0
 ###########################################################################
 # Makefile for the Linux 802.2 LLC (fully-functional) layer.
 #
 # Copyright (c) 1997 by Procom Technology,Inc.
 #              2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-#
-# This program can be redistributed or modified under the terms of the
-# GNU General Public License as published by the Free Software Foundation.
-# This program is distributed without any warranty or implied warranty
-# of merchantability or fitness for a particular purpose.
-#
-# See the GNU General Public License for more details.
 ###########################################################################
 
 obj-$(CONFIG_LLC) += llc.o

diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 35278c519a3050cb75558d58bbee8425a2df50bd..8ed1be1ecccc5927eb9d76446999b4c63cff238d 100644 (file)
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * af_llc.c - LLC User Interface SAPs
  * Description:
@@ -12,13 +13,6 @@
  *
  * Copyright (c) 2001 by Jay Schulist <jschlst@samba.org>
  *              2002-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 #include <linux/compiler.h>
 #include <linux/kernel.h>

diff --git a/net/llc/llc_c_ac.c b/net/llc/llc_c_ac.c
index ab86c720b3ecf9cf4b2280b60c941b9222edd7ee..724ecd741d4cf482d1768fd2e35342171ba1ecf2 100644 (file)
--- a/net/llc/llc_c_ac.c
+++ b/net/llc/llc_c_ac.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * llc_c_ac.c - actions performed during connection state transition.
  *
@@ -9,13 +10,6 @@
  *
  * Copyright (c) 1997 by Procom Technology, Inc.
  *              2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 #include <linux/netdevice.h>
 #include <linux/slab.h>

diff --git a/net/llc/llc_c_ev.c b/net/llc/llc_c_ev.c
index d6627a80cb459b2e8ffaa19b6e387e2248272e02..beb2836c7db04f30d01375fe4ffb5bbbce9f1c9e 100644 (file)
--- a/net/llc/llc_c_ev.c
+++ b/net/llc/llc_c_ev.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * llc_c_ev.c - Connection component state transition event qualifiers
  *
@@ -25,13 +26,6 @@
  *
  * Copyright (c) 1997 by Procom Technology, Inc.
  *              2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 #include <linux/netdevice.h>
 #include <net/llc_conn.h>

diff --git a/net/llc/llc_c_st.c b/net/llc/llc_c_st.c
index 1c267db304df8dff411e9d28a70128e14837050a..5fbd8d19c6c407bf7d1bbaf0698c0a4552938eba 100644 (file)
--- a/net/llc/llc_c_st.c
+++ b/net/llc/llc_c_st.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * llc_c_st.c - This module contains state transition of connection component.
  *
@@ -6,13 +7,6 @@
  *
  * Copyright (c) 1997 by Procom Technology, Inc.
  *              2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 #include <linux/types.h>
 #include <net/llc_if.h>

diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index 5c0ac243b248fcb349c7b4a839a7364f8c3666b2..e8f427375c6891e1fdf98fc9f7f7e3bca05a726d 100644 (file)
--- a/net/llc/llc_conn.c
+++ b/net/llc/llc_conn.c
@@ -1,15 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * llc_conn.c - Driver routines for connection component.
  *
  * Copyright (c) 1997 by Procom Technology, Inc.
  *              2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 
 #include <linux/init.h>

diff --git a/net/llc/llc_core.c b/net/llc/llc_core.c
index d73f5414d8ce71c56390f2c22d823dcc418c1b8b..5b0f1986bddc924a416521fe7eeb79bdd9ed1243 100644 (file)
--- a/net/llc/llc_core.c
+++ b/net/llc/llc_core.c
@@ -1,15 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * llc_core.c - Minimum needed routines for sap handling and module init/exit
  *
  * Copyright (c) 1997 by Procom Technology, Inc.
  *              2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 
 #include <linux/module.h>

diff --git a/net/llc/llc_if.c b/net/llc/llc_if.c
index 58a5f419adc6b8906b3d47ce708c557dadf0c9ff..1514362e613d134c5c77ce35aaee6109af29a095 100644 (file)
--- a/net/llc/llc_if.c
+++ b/net/llc/llc_if.c
@@ -1,15 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * llc_if.c - Defines LLC interface to upper layer
  *
  * Copyright (c) 1997 by Procom Technology, Inc.
  *              2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 #include <linux/gfp.h>
 #include <linux/module.h>

diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c
index 61b0159b2fbee60bdc2623b6c73ed1651b17a050..8eb3d73c39d12e4a7b0ebee5d18311eade5eb3ab 100644 (file)
--- a/net/llc/llc_input.c
+++ b/net/llc/llc_input.c
@@ -1,15 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * llc_input.c - Minimal input path for LLC
  *
  * Copyright (c) 1997 by Procom Technology, Inc.
  *              2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 #include <linux/netdevice.h>
 #include <linux/slab.h>

diff --git a/net/llc/llc_pdu.c b/net/llc/llc_pdu.c
index 63749dde542f863a277a4e8cd4988e7f43093359..c1938fa24a3f40be18540ee609c5e53d6d8a85d3 100644 (file)
--- a/net/llc/llc_pdu.c
+++ b/net/llc/llc_pdu.c
@@ -1,15 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * llc_pdu.c - access to PDU internals
  *
  * Copyright (c) 1997 by Procom Technology, Inc.
  *              2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 
 #include <linux/netdevice.h>

diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
index aa81c67b24a1566149fca5652f95ad4ba226552d..4804a08c249006ac4f115fdfacd2eedef1635e5e 100644 (file)
--- a/net/llc/llc_proc.c
+++ b/net/llc/llc_proc.c
@@ -1,15 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * proc_llc.c - proc interface for LLC
  *
  * Copyright (c) 2001 by Jay Schulist <jschlst@samba.org>
  *              2002-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 
 #include <linux/init.h>

diff --git a/net/llc/llc_s_ac.c b/net/llc/llc_s_ac.c
index 7a0cae9a8111488979ce1c22bcc7ed86ccee5269..98deee560373515007fba57463e5a5868650ff42 100644 (file)
--- a/net/llc/llc_s_ac.c
+++ b/net/llc/llc_s_ac.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * llc_s_ac.c - actions performed during sap state transition.
  *
@@ -9,13 +10,6 @@
  *
  * Copyright (c) 1997 by Procom Technology, Inc.
  *              2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 
 #include <linux/netdevice.h>

diff --git a/net/llc/llc_s_ev.c b/net/llc/llc_s_ev.c
index a74d2a1d658135ede739363b66e2b6883865e09b..cfbecba589e70d95eb4706564c0615b06f44da27 100644 (file)
--- a/net/llc/llc_s_ev.c
+++ b/net/llc/llc_s_ev.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * llc_s_ev.c - Defines SAP component events
  *
@@ -6,13 +7,6 @@
  *
  * Copyright (c) 1997 by Procom Technology, Inc.
  *              2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 #include <linux/socket.h>
 #include <net/sock.h>

diff --git a/net/llc/llc_s_st.c b/net/llc/llc_s_st.c
index acccc827c5629225c68500588bc81703c0a62fbf..e14d4f52032728123f5ee6caa18730b6d90f1908 100644 (file)
--- a/net/llc/llc_s_st.c
+++ b/net/llc/llc_s_st.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * llc_s_st.c - Defines SAP component state machine transitions.
  *
@@ -6,13 +7,6 @@
  *
  * Copyright (c) 1997 by Procom Technology, Inc.
  *              2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 #include <linux/types.h>
 #include <net/llc_if.h>

diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c
index 6cd03c2ae7d50f4a2eb8fdfd27754651c8bc3de9..1bd446a21092f8cd66474da7f1f931e62c5402eb 100644 (file)
--- a/net/llc/llc_sap.c
+++ b/net/llc/llc_sap.c
@@ -1,15 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * llc_sap.c - driver routines for SAP component.
  *
  * Copyright (c) 1997 by Procom Technology, Inc.
  *              2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 
 #include <net/llc.h>

diff --git a/net/llc/llc_station.c b/net/llc/llc_station.c
index f5065429251095a116b9abbd5f0ba1df4d881142..77fd0ac752638b11134c4a3ddc38b0a29b7e287a 100644 (file)
--- a/net/llc/llc_station.c
+++ b/net/llc/llc_station.c
@@ -1,15 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * llc_station.c - station component of LLC
  *
  * Copyright (c) 1997 by Procom Technology, Inc.
  *              2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
  */
 #include <linux/init.h>
 #include <linux/module.h>