[PATCH] net: Add SPDX ids to some source files

Tim Bird
2026-03-05T00:47:53Z

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>
---
---
net/core/fib_notifier.c | 1 +
net/core/sock_diag.c | 3 +--
net/dns_resolver/dns_key.c | 14 +-------------
net/dns_resolver/dns_query.c | 14 +-------------
net/dns_resolver/internal.h | 14 +-------------
net/ipv4/inetpeer.c | 3 +--
net/ipv4/ipmr_base.c | 1 +
net/ipv4/netfilter.c | 3 ++-
net/ipv4/tcp_bbr.c | 1 +
net/ipv4/tcp_dctcp.h | 1 +
net/ipv4/tcp_plb.c | 1 +
net/ipv6/fib6_notifier.c | 1 +
net/ipv6/ila/ila_common.c | 1 +
net/ipv6/netfilter.c | 3 ++-
net/netfilter/core.c | 3 +--
net/netfilter/nf_conntrack_netlink.c | 4 +---
net/netfilter/nf_flow_table_offload.c | 1 +
net/netfilter/nf_queue.c | 1 +
net/netfilter/nfnetlink.c | 4 +---
net/netfilter/nft_chain_filter.c | 1 +
net/netfilter/xt_connbytes.c | 3 ++-
net/netfilter/xt_connlimit.c | 3 ++-
net/netfilter/xt_time.c | 3 +--
23 files changed, 27 insertions(+), 57 deletions(-)

diff --git a/net/core/fib_notifier.c b/net/core/fib_notifier.c
index 5cdca49b1d7c..6bb2cc7e88ca 100644
--- 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 c83335c62360..f67accd60675 100644
--- 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 c42ddd85ff1f..9d998e267f5f 100644
--- 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 53da62984447..e1c09d7b8200 100644
--- 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 0c570d40e4d6..d0d8edcea092 100644
--- 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 7b1e0a2d6906..9fa396d5f09f 100644
--- 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 2d62526406ca..57721827a61a 100644
--- 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 ce310eb779e0..ce9e1bfa4259 100644
--- 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 760941e55153..05d52372ca8f 100644
--- 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 4b0259111d81..f13f8d770576 100644
--- 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 4bcf7eff95e3..68ccdb9a5412 100644
--- 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 949b72610df7..64cd4ed8864c 100644
--- 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 b8d43ed4689d..e71571455c8a 100644
--- 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 46540a5a4331..c3dc90dfab80 100644
--- 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 11a702065bab..d5df44ea9e7b 100644
--- 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 c9d725fc2d71..9b295867a105 100644
--- 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 9b677e116487..b2e4fb6fa011 100644
--- 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 7f12e56e6e52..a6c81c04b3a5 100644
--- 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 e62a0dea24ea..47f3ed441f64 100644
--- 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 b16185e9a6dd..14b14c46c314 100644
--- 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 2aabdcea8707..1c6ffc7f1622 100644
--- 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 848287ab79cf..42df9e175aff 100644
--- 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 00319d2a54da..9068cf88ec30 100644
--- 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
--
2.43.0