net: Add SPDX ids to some source files

Add SPDX-License-Identifier lines to several source
files under the network sub-directory.  Work on files
in the core, dns_resolver, ipv4, ipv6 and
netfilter sub-dirs.  Remove boilerplate
and license reference text to avoid ambiguity.

Rusty Russell has expressed that his contributions
were intended to be GPL-2.0-or-later.

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

diff --git a/net/core/fib_notifier.c b/net/core/fib_notifier.c
index 5cdca49b1d7c1cc9097c6a9fe93fae701c54eaca..6bb2cc7e88ca3ab8402ae5d4c6aa19417724e2b2 100644 (file)
--- a/net/core/fib_notifier.c
+++ b/net/core/fib_notifier.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/rtnetlink.h>
 #include <linux/notifier.h>
 #include <linux/rcupdate.h>

diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
index c83335c623603afcbecaccb3d53c63b5a36336fa..f67accd606753251d4164a0afc531c9d4dd5ca02 100644 (file)
--- a/net/core/sock_diag.c
+++ b/net/core/sock_diag.c
@@ -1,5 +1,4 @@
-/* License: GPL */
-
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/filter.h>
 #include <linux/mutex.h>
 #include <linux/socket.h>

diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c
index 891287a869796dc148526d3aa1838fd2b9a95ab7..c3c8c3240ef946a75e5b028df0ced175e15c6eb7 100644 (file)
--- a/net/dns_resolver/dns_key.c
+++ b/net/dns_resolver/dns_key.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
 /* Key type used to cache DNS lookups made by the kernel
  *
  * See Documentation/networking/dns_resolver.rst
@@ -7,19 +8,6 @@
  *              Steve French (sfrench@us.ibm.com)
  *              Wang Lei (wang840925@gmail.com)
  *             David Howells (dhowells@redhat.com)
- *
- *   This library is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU Lesser General Public License as published
- *   by the Free Software Foundation; either version 2.1 of the License, or
- *   (at your option) any later version.
- *
- *   This library is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU Lesser General Public License for more details.
- *
- *   You should have received a copy of the GNU Lesser General Public License
- *   along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <linux/module.h>
 #include <linux/moduleparam.h>

diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c
index 53da6298444758b4f4482d264c907071e2ae8c6a..e1c09d7b8200774d39c9b9b83cd058706d022248 100644 (file)
--- a/net/dns_resolver/dns_query.c
+++ b/net/dns_resolver/dns_query.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
 /* Upcall routine, designed to work as a key type and working through
  * /sbin/request-key to contact userspace when handling DNS queries.
  *
@@ -20,19 +21,6 @@
  *   For example to use this module to query AFSDB RR:
  *
  *     create dns_resolver afsdb:* * /sbin/dns.afsdb %k
- *
- *   This library is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU Lesser General Public License as published
- *   by the Free Software Foundation; either version 2.1 of the License, or
- *   (at your option) any later version.
- *
- *   This library is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU Lesser General Public License for more details.
- *
- *   You should have received a copy of the GNU Lesser General Public License
- *   along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <linux/module.h>

diff --git a/net/dns_resolver/internal.h b/net/dns_resolver/internal.h
index 0c570d40e4d63283c25b9fb5c51b8879765b4aae..d0d8edcea0922759bab94b8d81b7cdd7425fb93f 100644 (file)
--- a/net/dns_resolver/internal.h
+++ b/net/dns_resolver/internal.h
@@ -1,21 +1,9 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
  *   Copyright (c) 2010 Wang Lei
  *   Author(s): Wang Lei (wang840925@gmail.com). All Rights Reserved.
  *
  *   Internal DNS Rsolver stuff
- *
- *   This library is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU Lesser General Public License as published
- *   by the Free Software Foundation; either version 2.1 of the License, or
- *   (at your option) any later version.
- *
- *   This library is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU Lesser General Public License for more details.
- *
- *   You should have received a copy of the GNU Lesser General Public License
- *   along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <linux/compiler.h>

diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
index 7b1e0a2d6906673316ec4bef777e359ac175dbf8..9fa396d5f09f7b188bb1ee081379046cd99e6659 100644 (file)
--- a/net/ipv4/inetpeer.c
+++ b/net/ipv4/inetpeer.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *             INETPEER - A storage for permanent information about peers
  *
- *  This source is covered by the GNU GPL, the same as all kernel sources.
- *
  *  Authors:   Andrey V. Savochkin <saw@msu.ru>
  */
 

diff --git a/net/ipv4/ipmr_base.c b/net/ipv4/ipmr_base.c
index b0fd9ffa01a2b9191315ac90745da1378a6f51e9..fd27f2ca69783bc04e76a42c0382b87a64069a07 100644 (file)
--- a/net/ipv4/ipmr_base.c
+++ b/net/ipv4/ipmr_base.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Linux multicast routing support
  * Common logic shared by IPv4 [ipmr] and IPv6 [ip6mr] implementation
  */

diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index ce310eb779e0d083ff84780adcb92f756841410e..ce9e1bfa4259faca21f2f3d3ea858a182f0baaa7 100644 (file)
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
@@ -1,7 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * IPv4 specific functions of netfilter core
  *
- * Rusty Russell (C) 2000 -- This code is GPL.
+ * Rusty Russell (C) 2000
  * Patrick McHardy (C) 2006-2012
  */
 #include <linux/kernel.h>

diff --git a/net/ipv4/tcp_bbr.c b/net/ipv4/tcp_bbr.c
index 760941e55153e6614e1043f674a720ad46fa9169..05d52372ca8fb068530a9b3379f1ae0f9d0b362a 100644 (file)
--- a/net/ipv4/tcp_bbr.c
+++ b/net/ipv4/tcp_bbr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Bottleneck Bandwidth and RTT (BBR) congestion control
  *
  * BBR congestion control computes the sending rate based on the delivery

diff --git a/net/ipv4/tcp_dctcp.h b/net/ipv4/tcp_dctcp.h
index 4b0259111d816610ca9459a3909f5ee8d0a05d50..f13f8d770576a0c28fdfa6d7e4352cade9397f7b 100644 (file)
--- a/net/ipv4/tcp_dctcp.h
+++ b/net/ipv4/tcp_dctcp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TCP_DCTCP_H
 #define _TCP_DCTCP_H
 

diff --git a/net/ipv4/tcp_plb.c b/net/ipv4/tcp_plb.c
index 4bcf7eff95e390b29603c4f3c358e519ed8bc1aa..68ccdb9a54127632b6b764b5cbb18e1589ab1aa7 100644 (file)
--- a/net/ipv4/tcp_plb.c
+++ b/net/ipv4/tcp_plb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Protective Load Balancing (PLB)
  *
  * PLB was designed to reduce link load imbalance across datacenter

diff --git a/net/ipv6/fib6_notifier.c b/net/ipv6/fib6_notifier.c
index 949b72610df704b6afe455daf0d680dbe4504e87..64cd4ed8864c3aebd4192879b6e03c71085e258b 100644 (file)
--- a/net/ipv6/fib6_notifier.c
+++ b/net/ipv6/fib6_notifier.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/notifier.h>
 #include <linux/socket.h>
 #include <linux/kernel.h>

diff --git a/net/ipv6/ila/ila_common.c b/net/ipv6/ila/ila_common.c
index b8d43ed4689db93efde42df05b7f4b73785a983e..e71571455c8a0ab72402b099d72bd945f6b3a073 100644 (file)
--- a/net/ipv6/ila/ila_common.c
+++ b/net/ipv6/ila/ila_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/errno.h>
 #include <linux/ip.h>
 #include <linux/kernel.h>

diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c
index 46540a5a43317a418c29cf649099006464f3809f..c3dc90dfab8045e629a0310e0a7c1749966b79d1 100644 (file)
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -1,7 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * IPv6 specific functions of netfilter core
  *
- * Rusty Russell (C) 2000 -- This code is GPL.
+ * Rusty Russell (C) 2000
  * Patrick McHardy (C) 2006-2012
  */
 #include <linux/kernel.h>

diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index 11a702065bab58d7278c0a41b03013fcd8ef799e..d5df44ea9e7bfacb6b7ce30e0315d066a39afebe 100644 (file)
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /* netfilter.c: look after the filters for various protocols.
  * Heavily influenced by the old firewall.c by David Bonn and Alan Cox.
  *
  * Thanks to Rob `CmdrTaco' Malda for not influencing this code in any
  * way.
- *
- * This code is GPL.
  */
 #include <linux/kernel.h>
 #include <linux/netfilter.h>

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index c9d725fc2d71c047aa69880623ff322609c3ea6b..9b295867a105efefd9e39b77e58c1c3f16479147 100644 (file)
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Connection tracking via netlink socket. Allows for user space
  * protocol helpers and general trouble making from userspace.
  *
@@ -10,9 +11,6 @@
  * generally made possible by Network Robots, Inc. (www.networkrobots.com)
  *
  * Further development of this code funded by Astaro AG (http://www.astaro.com)
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
  */
 
 #include <linux/init.h>

diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c
index 9b677e1164873d1690381c6ccef4348ef438091d..b2e4fb6fa0117e220fa85a1e99a6860f3b0e4c66 100644 (file)
--- a/net/netfilter/nf_flow_table_offload.c
+++ b/net/netfilter/nf_flow_table_offload.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>

diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index 7f12e56e6e526bcf55b7ff3e31e85a068ad2985d..a6c81c04b3a52a03a7c4dfcdfd0543cab3cc0f3d 100644 (file)
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Rusty Russell (C)2000 -- This code is GPL.
  * Patrick McHardy (c) 2006-2012

diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index e62a0dea24ea21121331ef48d37923f6e8ed2a40..47f3ed441f6445c51b5f9a0a0705dd11adf0fd93 100644 (file)
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Netfilter messages via netlink socket. Allows for user space
  * protocol helpers and general trouble making from userspace.
  *
@@ -9,9 +10,6 @@
  * generally made possible by Network Robots, Inc. (www.networkrobots.com)
  *
  * Further development of this code funded by Astaro AG (http://www.astaro.com)
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
  */
 
 #include <linux/module.h>

diff --git a/net/netfilter/nft_chain_filter.c b/net/netfilter/nft_chain_filter.c
index b16185e9a6dd7211400e36e7ec34aefcf2c7b9ce..14b14c46c31421d15b92f540fed7b4744a0e9504 100644 (file)
--- a/net/netfilter/nft_chain_filter.c
+++ b/net/netfilter/nft_chain_filter.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>

diff --git a/net/netfilter/xt_connbytes.c b/net/netfilter/xt_connbytes.c
index 2aabdcea8707236244984357c0d079acc5ffcb39..1c6ffc7f162244907280a3f9c02207f18e2d2238 100644 (file)
--- a/net/netfilter/xt_connbytes.c
+++ b/net/netfilter/xt_connbytes.c
@@ -1,5 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Kernel module to match connection tracking byte counter.
- * GPL (C) 2002 Martin Devera (devik@cdi.cz).
+ *  (C) 2002 Martin Devera (devik@cdi.cz).
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/module.h>

diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c
index 848287ab79cfb1f875e92fa25b13c74e6d428ac1..42df9e175affebffbdcae1b6f48c59acaa157a7c 100644 (file)
--- a/net/netfilter/xt_connlimit.c
+++ b/net/netfilter/xt_connlimit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * netfilter module to limit the number of parallel tcp
  * connections per IP address.
@@ -9,7 +10,7 @@
  * based on ...
  *
  * Kernel module to match connection tracking information.
- * GPL (C) 1999  Rusty Russell (rusty@rustcorp.com.au).
+ *   (C) 1999  Rusty Russell (rusty@rustcorp.com.au).
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 

diff --git a/net/netfilter/xt_time.c b/net/netfilter/xt_time.c
index 00319d2a54da23559a50fb8c60d1340ebb5cba83..9068cf88ec30d0e2c5f6a9980d8b9195b1e6d6dc 100644 (file)
--- a/net/netfilter/xt_time.c
+++ b/net/netfilter/xt_time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *     xt_time
  *     Copyright © CC Computer Consultants GmbH, 2007
@@ -6,8 +7,6 @@
  *     This is a module which is used for time matching
  *     It is using some modified code from dietlibc (localtime() function)
  *     that you can find at https://www.fefe.de/dietlibc/
- *     This file is distributed under the terms of the GNU General Public
- *     License (GPL). Copies of the GPL can be obtained from gnu.org/gpl.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt