netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 iproute2 00/11] SPDX cleanups
@ 2023-01-11 18:52 Stephen Hemminger
  2023-01-11 18:52 ` [PATCH v2 iproute2 01/11] bridge: use SPDX Stephen Hemminger
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: Stephen Hemminger @ 2023-01-11 18:52 UTC (permalink / raw)
  To: netdev; +Cc: Stephen Hemminger

Cleanout the GPL boiler plate in iproute.
Better to use modern SPDX to document the license
rather than copy/paste same text in multiple places.

There is no change in licensing here, and none is planned.

v2 rebase and found some more missing SPDX places

Stephen Hemminger (11):
  bridge: use SPDX
  genl: use SPDX
  lib: replace GPL boilerplate with SPDX
  devlink: use SPDX
  ip: use SPDX
  testsuite: use SPDX
  tipc: use SPDX
  tc: replace GPL-BSD boilerplate in codel and fq
  tc: use SPDX
  misc: use SPDX
  netem: add SPDX license header

 bridge/monitor.c                 |  7 +------
 devlink/devlink.c                |  6 +-----
 devlink/mnlg.c                   |  6 +-----
 devlink/mnlg.h                   |  6 +-----
 genl/ctrl.c                      |  6 +-----
 genl/genl.c                      |  7 +------
 ip/ip.c                          |  6 +-----
 ip/ip6tunnel.c                   | 15 +--------------
 ip/ipaddress.c                   |  7 +------
 ip/ipaddrlabel.c                 | 16 +---------------
 ip/ipfou.c                       |  6 +-----
 ip/ipila.c                       |  6 +-----
 ip/ipl2tp.c                      |  7 +------
 ip/iplink.c                      |  7 +------
 ip/iplink_amt.c                  |  6 +-----
 ip/iplink_batadv.c               |  1 +
 ip/iplink_bond.c                 |  6 +-----
 ip/iplink_bond_slave.c           |  6 +-----
 ip/iplink_bridge.c               |  6 +-----
 ip/iplink_bridge_slave.c         |  6 +-----
 ip/iplink_can.c                  |  6 +-----
 ip/iplink_geneve.c               |  6 +-----
 ip/iplink_hsr.c                  |  6 +-----
 ip/iplink_ipoib.c                |  6 +-----
 ip/iplink_ipvlan.c               |  6 +-----
 ip/iplink_macvlan.c              |  6 +-----
 ip/iplink_netdevsim.c            |  1 +
 ip/iplink_vlan.c                 |  6 +-----
 ip/iplink_vrf.c                  |  6 +-----
 ip/iplink_vxcan.c                |  6 +-----
 ip/iplink_vxlan.c                |  6 +-----
 ip/iplink_xdp.c                  |  6 +-----
 ip/iplink_xstats.c               |  6 +-----
 ip/ipmacsec.c                    |  6 +-----
 ip/ipmaddr.c                     |  7 +------
 ip/ipmonitor.c                   |  7 +------
 ip/ipmroute.c                    |  7 +------
 ip/ipneigh.c                     |  7 +------
 ip/ipnetconf.c                   |  7 +------
 ip/ipntable.c                    | 18 ++----------------
 ip/ipprefix.c                    | 17 ++---------------
 ip/iproute.c                     |  7 +------
 ip/iproute_lwtunnel.c            |  7 +------
 ip/iprule.c                      |  7 +------
 ip/ipseg6.c                      |  5 +----
 ip/iptoken.c                     |  6 +-----
 ip/iptunnel.c                    |  7 +------
 ip/iptuntap.c                    |  7 +------
 ip/ipvrf.c                       |  7 +------
 ip/ipxfrm.c                      | 20 ++------------------
 ip/link_gre.c                    |  7 +------
 ip/link_gre6.c                   |  7 +------
 ip/link_ip6tnl.c                 |  7 +------
 ip/link_iptnl.c                  |  7 +------
 ip/link_veth.c                   |  7 +------
 ip/link_vti.c                    |  6 +-----
 ip/link_vti6.c                   |  6 +-----
 ip/rtm_map.c                     |  7 +------
 ip/rtmon.c                       |  7 +------
 ip/tcp_metrics.c                 |  5 +----
 ip/tunnel.c                      | 18 ++----------------
 ip/tunnel.h                      | 15 +--------------
 ip/xfrm.h                        | 17 +----------------
 ip/xfrm_monitor.c                | 20 ++------------------
 ip/xfrm_policy.c                 | 20 ++------------------
 ip/xfrm_state.c                  | 20 ++------------------
 lib/bpf_legacy.c                 |  6 +-----
 lib/cg_map.c                     |  6 +-----
 lib/fs.c                         |  7 +------
 lib/inet_proto.c                 |  7 +------
 lib/json_print.c                 |  8 ++------
 lib/libnetlink.c                 |  7 +------
 lib/ll_addr.c                    |  6 +-----
 lib/ll_map.c                     |  7 +------
 lib/ll_proto.c                   |  5 +----
 lib/ll_types.c                   |  6 +-----
 lib/names.c                      |  7 +------
 lib/namespace.c                  |  6 +-----
 lib/rt_names.c                   |  6 +-----
 lib/utils.c                      |  7 +------
 misc/arpd.c                      |  6 +-----
 misc/ifstat.c                    |  6 +-----
 misc/lnstat.c                    |  7 +------
 misc/lnstat_util.c               |  7 +------
 misc/nstat.c                     |  6 +-----
 misc/rtacct.c                    |  7 +------
 misc/ss.c                        |  6 +-----
 misc/ss_util.h                   |  1 +
 misc/ssfilter.h                  |  1 +
 misc/ssfilter.y                  |  1 +
 misc/ssfilter_check.c            |  1 +
 netem/maketable.c                |  1 +
 netem/normal.c                   |  1 +
 netem/pareto.c                   |  1 +
 netem/paretonormal.c             |  1 +
 netem/stats.c                    |  1 +
 tc/e_bpf.c                       |  6 +-----
 tc/em_canid.c                    |  6 +-----
 tc/em_cmp.c                      |  6 +-----
 tc/em_ipset.c                    |  5 +----
 tc/em_ipt.c                      |  5 +----
 tc/em_meta.c                     |  6 +-----
 tc/em_nbyte.c                    |  6 +-----
 tc/em_u32.c                      |  6 +-----
 tc/emp_ematch.y                  |  1 +
 tc/f_basic.c                     |  7 +------
 tc/f_bpf.c                       |  6 +-----
 tc/f_cgroup.c                    |  7 +------
 tc/f_flow.c                      |  6 +-----
 tc/f_flower.c                    |  6 +-----
 tc/f_fw.c                        |  7 +------
 tc/f_matchall.c                  |  7 +------
 tc/f_route.c                     |  7 +------
 tc/f_rsvp.c                      |  7 +------
 tc/f_u32.c                       |  6 +-----
 tc/m_action.c                    |  6 +-----
 tc/m_bpf.c                       |  6 +-----
 tc/m_connmark.c                  | 13 +------------
 tc/m_csum.c                      |  6 +-----
 tc/m_ematch.c                    |  6 +-----
 tc/m_estimator.c                 |  7 +------
 tc/m_gact.c                      |  7 +------
 tc/m_ife.c                       |  7 +------
 tc/m_ipt.c                       |  6 +-----
 tc/m_mirred.c                    |  7 +------
 tc/m_nat.c                       |  7 +------
 tc/m_pedit.c                     |  7 +------
 tc/m_pedit.h                     |  5 +----
 tc/m_police.c                    | 10 +---------
 tc/m_sample.c                    |  7 +------
 tc/m_simple.c                    |  6 +-----
 tc/m_skbedit.c                   | 14 +-------------
 tc/m_skbmod.c                    |  7 +------
 tc/m_tunnel_key.c                |  6 +-----
 tc/m_vlan.c                      |  6 +-----
 tc/m_xt.c                        |  6 +-----
 tc/m_xt_old.c                    |  6 +-----
 tc/p_eth.c                       |  6 +-----
 tc/p_icmp.c                      |  7 +------
 tc/p_ip.c                        |  7 +------
 tc/p_ip6.c                       |  7 +------
 tc/p_tcp.c                       |  7 +------
 tc/p_udp.c                       |  7 +------
 tc/q_atm.c                       |  1 -
 tc/q_cbq.c                       |  7 +------
 tc/q_cbs.c                       |  7 +------
 tc/q_choke.c                     |  6 +-----
 tc/q_codel.c                     | 32 +-------------------------------
 tc/q_drr.c                       |  7 +------
 tc/q_dsmark.c                    |  1 -
 tc/q_etf.c                       |  7 +------
 tc/q_fifo.c                      |  7 +------
 tc/q_fq.c                        | 32 +-------------------------------
 tc/q_fq_codel.c                  | 32 +-------------------------------
 tc/q_gred.c                      |  6 +-----
 tc/q_hfsc.c                      |  7 +------
 tc/q_ingress.c                   |  6 +-----
 tc/q_mqprio.c                    |  6 +-----
 tc/q_multiq.c                    | 13 +------------
 tc/q_pie.c                       | 12 +-----------
 tc/q_prio.c                      |  7 +------
 tc/q_qfq.c                       |  6 +-----
 tc/q_red.c                       |  7 +------
 tc/q_sfb.c                       |  9 +--------
 tc/q_sfq.c                       |  7 +------
 tc/q_skbprio.c                   |  7 +------
 tc/q_taprio.c                    |  6 +-----
 tc/q_tbf.c                       |  7 +------
 tc/tc.c                          | 10 +---------
 tc/tc_cbq.c                      |  7 +------
 tc/tc_class.c                    |  7 +------
 tc/tc_core.c                     |  7 +------
 tc/tc_estimator.c                |  7 +------
 tc/tc_exec.c                     |  6 +-----
 tc/tc_filter.c                   |  7 +------
 tc/tc_monitor.c                  |  7 +------
 tc/tc_qdisc.c                    |  6 +-----
 tc/tc_red.c                      |  7 +------
 tc/tc_stab.c                     |  7 +------
 tc/tc_util.c                     |  7 +------
 testsuite/tools/generate_nlmsg.c |  6 +-----
 tipc/bearer.c                    |  6 +-----
 tipc/bearer.h                    |  6 +-----
 tipc/cmdl.c                      |  6 +-----
 tipc/cmdl.h                      |  6 +-----
 tipc/link.c                      |  6 +-----
 tipc/link.h                      |  6 +-----
 tipc/media.c                     |  6 +-----
 tipc/media.h                     |  6 +-----
 tipc/misc.c                      |  6 +-----
 tipc/misc.h                      |  6 +-----
 tipc/msg.c                       |  6 +-----
 tipc/msg.h                       |  6 +-----
 tipc/nametable.c                 |  6 +-----
 tipc/nametable.h                 |  6 +-----
 tipc/node.c                      |  6 +-----
 tipc/node.h                      |  6 +-----
 tipc/peer.c                      |  6 +-----
 tipc/peer.h                      |  6 +-----
 tipc/socket.c                    |  6 +-----
 tipc/socket.h                    |  6 +-----
 tipc/tipc.c                      |  6 +-----
 202 files changed, 208 insertions(+), 1248 deletions(-)

-- 
2.39.0


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v2 iproute2 01/11] bridge: use SPDX
  2023-01-11 18:52 [PATCH v2 iproute2 00/11] SPDX cleanups Stephen Hemminger
@ 2023-01-11 18:52 ` Stephen Hemminger
  2023-01-11 18:52 ` [PATCH v2 iproute2 02/11] genl: " Stephen Hemminger
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Stephen Hemminger @ 2023-01-11 18:52 UTC (permalink / raw)
  To: netdev; +Cc: Stephen Hemminger

Replace GPL 2.0 or later boilerplate text.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 bridge/monitor.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/bridge/monitor.c b/bridge/monitor.c
index d82f45cc02d1..552614d79902 100644
--- a/bridge/monitor.c
+++ b/bridge/monitor.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * brmonitor.c		"bridge monitor"
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Stephen Hemminger <shemminger@vyatta.com>
- *
  */
 
 #include <stdio.h>
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 iproute2 02/11] genl: use SPDX
  2023-01-11 18:52 [PATCH v2 iproute2 00/11] SPDX cleanups Stephen Hemminger
  2023-01-11 18:52 ` [PATCH v2 iproute2 01/11] bridge: use SPDX Stephen Hemminger
@ 2023-01-11 18:52 ` Stephen Hemminger
  2023-01-11 18:52 ` [PATCH v2 iproute2 03/11] lib: replace GPL boilerplate with SPDX Stephen Hemminger
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Stephen Hemminger @ 2023-01-11 18:52 UTC (permalink / raw)
  To: netdev; +Cc: Stephen Hemminger

Replace GPL 2.0 or later boilerplate.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 genl/ctrl.c | 6 +-----
 genl/genl.c | 7 +------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/genl/ctrl.c b/genl/ctrl.c
index 549bc6635831..a2d87af0ad07 100644
--- a/genl/ctrl.c
+++ b/genl/ctrl.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ctrl.c	generic netlink controller
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	J Hadi Salim (hadi@cyberus.ca)
  *		Johannes Berg (johannes@sipsolutions.net)
  */
diff --git a/genl/genl.c b/genl/genl.c
index 6557e6bc6ce6..85cc73bb2e18 100644
--- a/genl/genl.c
+++ b/genl/genl.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * genl.c		"genl" utility frontend.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Jamal Hadi Salim
- *
  */
 
 #include <stdio.h>
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 iproute2 03/11] lib: replace GPL boilerplate with SPDX
  2023-01-11 18:52 [PATCH v2 iproute2 00/11] SPDX cleanups Stephen Hemminger
  2023-01-11 18:52 ` [PATCH v2 iproute2 01/11] bridge: use SPDX Stephen Hemminger
  2023-01-11 18:52 ` [PATCH v2 iproute2 02/11] genl: " Stephen Hemminger
@ 2023-01-11 18:52 ` Stephen Hemminger
  2023-01-11 18:52 ` [PATCH v2 iproute2 04/11] devlink: use SPDX Stephen Hemminger
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Stephen Hemminger @ 2023-01-11 18:52 UTC (permalink / raw)
  To: netdev; +Cc: Stephen Hemminger

Replace standard GPL 2.0 or later text with SPDX tag.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 lib/bpf_legacy.c | 6 +-----
 lib/cg_map.c     | 6 +-----
 lib/fs.c         | 7 +------
 lib/inet_proto.c | 7 +------
 lib/json_print.c | 8 ++------
 lib/libnetlink.c | 7 +------
 lib/ll_addr.c    | 6 +-----
 lib/ll_map.c     | 7 +------
 lib/ll_proto.c   | 5 +----
 lib/ll_types.c   | 6 +-----
 lib/names.c      | 7 +------
 lib/namespace.c  | 6 +-----
 lib/rt_names.c   | 6 +-----
 lib/utils.c      | 7 +------
 14 files changed, 15 insertions(+), 76 deletions(-)

diff --git a/lib/bpf_legacy.c b/lib/bpf_legacy.c
index 4fabdcc899e4..8ac642358969 100644
--- a/lib/bpf_legacy.c
+++ b/lib/bpf_legacy.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * bpf.c	BPF common code
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Daniel Borkmann <daniel@iogearbox.net>
  *		Jiri Pirko <jiri@resnulli.us>
  *		Alexei Starovoitov <ast@kernel.org>
diff --git a/lib/cg_map.c b/lib/cg_map.c
index 39f244dbc5bd..e5d14d512c39 100644
--- a/lib/cg_map.c
+++ b/lib/cg_map.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * cg_map.c	cgroup v2 cache
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Dmitry Yakunin <zeil@yandex-team.ru>
  */
 
diff --git a/lib/fs.c b/lib/fs.c
index 3752931cf8f8..22d4af7583dd 100644
--- a/lib/fs.c
+++ b/lib/fs.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * fs.c         filesystem APIs
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	David Ahern <dsa@cumulusnetworks.com>
- *
  */
 
 #include <sys/types.h>
diff --git a/lib/inet_proto.c b/lib/inet_proto.c
index 41e2e8b88d82..71cd3b128841 100644
--- a/lib/inet_proto.c
+++ b/lib/inet_proto.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * inet_proto.c
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/lib/json_print.c b/lib/json_print.c
index 741acdcff990..d7ee76b10de8 100644
--- a/lib/json_print.c
+++ b/lib/json_print.c
@@ -1,10 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
- * json_print.c		"print regular or json output, based on json_writer".
- *
- *             This program is free software; you can redistribute it and/or
- *             modify it under the terms of the GNU General Public License
- *             as published by the Free Software Foundation; either version
- *             2 of the License, or (at your option) any later version.
+ * json_print.c	 - print regular or json output, based on json_writer
  *
  * Authors:    Julien Fortin, <julien@cumulusnetworks.com>
  */
diff --git a/lib/libnetlink.c b/lib/libnetlink.c
index 001efc1d7f24..c89760436aba 100644
--- a/lib/libnetlink.c
+++ b/lib/libnetlink.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * libnetlink.c	RTnetlink service routines.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/lib/ll_addr.c b/lib/ll_addr.c
index d6fd736b1e3a..5e9245915ef3 100644
--- a/lib/ll_addr.c
+++ b/lib/ll_addr.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ll_addr.c
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
diff --git a/lib/ll_map.c b/lib/ll_map.c
index 70ea3d499c8f..8970c20f3cdd 100644
--- a/lib/ll_map.c
+++ b/lib/ll_map.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ll_map.c
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/lib/ll_proto.c b/lib/ll_proto.c
index 925e2caa05e5..526e582fbbba 100644
--- a/lib/ll_proto.c
+++ b/lib/ll_proto.c
@@ -1,10 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ll_proto.c
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
  *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
diff --git a/lib/ll_types.c b/lib/ll_types.c
index 49da15df911d..fa57ceb5c3b8 100644
--- a/lib/ll_types.c
+++ b/lib/ll_types.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ll_types.c
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
diff --git a/lib/names.c b/lib/names.c
index b46ea7910946..cbfa971ff61b 100644
--- a/lib/names.c
+++ b/lib/names.c
@@ -1,11 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * names.c		db names
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  */
 
 #include <stdio.h>
diff --git a/lib/namespace.c b/lib/namespace.c
index 45a7deddb6c4..1202fa85f97d 100644
--- a/lib/namespace.c
+++ b/lib/namespace.c
@@ -1,10 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * namespace.c
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
  */
 
 #include <sys/statvfs.h>
diff --git a/lib/rt_names.c b/lib/rt_names.c
index b976471d7979..2432224acc0a 100644
--- a/lib/rt_names.c
+++ b/lib/rt_names.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * rt_names.c		rtnetlink names DB.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
diff --git a/lib/utils.c b/lib/utils.c
index dd3cdb31239c..b740531ab6c9 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * utils.c
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 iproute2 04/11] devlink: use SPDX
  2023-01-11 18:52 [PATCH v2 iproute2 00/11] SPDX cleanups Stephen Hemminger
                   ` (2 preceding siblings ...)
  2023-01-11 18:52 ` [PATCH v2 iproute2 03/11] lib: replace GPL boilerplate with SPDX Stephen Hemminger
@ 2023-01-11 18:52 ` Stephen Hemminger
  2023-01-11 18:52 ` [PATCH v2 iproute2 05/11] ip: " Stephen Hemminger
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Stephen Hemminger @ 2023-01-11 18:52 UTC (permalink / raw)
  To: netdev; +Cc: Stephen Hemminger

Add SPDX tag instead of GPL 2.0 or later boilerplate

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 devlink/devlink.c | 6 +-----
 devlink/mnlg.c    | 6 +-----
 devlink/mnlg.h    | 6 +-----
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/devlink/devlink.c b/devlink/devlink.c
index ae93e7cb620e..931a768a41d1 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * devlink.c	Devlink tool
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Jiri Pirko <jiri@mellanox.com>
  */
 
diff --git a/devlink/mnlg.c b/devlink/mnlg.c
index b2e0b8c0f274..d049eb5a45a3 100644
--- a/devlink/mnlg.c
+++ b/devlink/mnlg.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  *   mnlg.c	Generic Netlink helpers for libmnl
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Jiri Pirko <jiri@mellanox.com>
  */
 
diff --git a/devlink/mnlg.h b/devlink/mnlg.h
index 24aa17566a9b..3249c54c45a4 100644
--- a/devlink/mnlg.h
+++ b/devlink/mnlg.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  *   mnlg.h	Generic Netlink helpers for libmnl
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Jiri Pirko <jiri@mellanox.com>
  */
 
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 iproute2 05/11] ip: use SPDX
  2023-01-11 18:52 [PATCH v2 iproute2 00/11] SPDX cleanups Stephen Hemminger
                   ` (3 preceding siblings ...)
  2023-01-11 18:52 ` [PATCH v2 iproute2 04/11] devlink: use SPDX Stephen Hemminger
@ 2023-01-11 18:52 ` Stephen Hemminger
  2023-01-11 18:52 ` [PATCH v2 iproute2 06/11] testsuite: " Stephen Hemminger
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Stephen Hemminger @ 2023-01-11 18:52 UTC (permalink / raw)
  To: netdev; +Cc: Stephen Hemminger

Use SPDX instead of boilerplate text for ip and related
sub commands.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 ip/ip.c                  |  6 +-----
 ip/ip6tunnel.c           | 15 +--------------
 ip/ipaddress.c           |  7 +------
 ip/ipaddrlabel.c         | 16 +---------------
 ip/ipfou.c               |  6 +-----
 ip/ipila.c               |  6 +-----
 ip/ipl2tp.c              |  7 +------
 ip/iplink.c              |  7 +------
 ip/iplink_amt.c          |  6 +-----
 ip/iplink_batadv.c       |  1 +
 ip/iplink_bond.c         |  6 +-----
 ip/iplink_bond_slave.c   |  6 +-----
 ip/iplink_bridge.c       |  6 +-----
 ip/iplink_bridge_slave.c |  6 +-----
 ip/iplink_can.c          |  6 +-----
 ip/iplink_geneve.c       |  6 +-----
 ip/iplink_hsr.c          |  6 +-----
 ip/iplink_ipoib.c        |  6 +-----
 ip/iplink_ipvlan.c       |  6 +-----
 ip/iplink_macvlan.c      |  6 +-----
 ip/iplink_netdevsim.c    |  1 +
 ip/iplink_vlan.c         |  6 +-----
 ip/iplink_vrf.c          |  6 +-----
 ip/iplink_vxcan.c        |  6 +-----
 ip/iplink_vxlan.c        |  6 +-----
 ip/iplink_xdp.c          |  6 +-----
 ip/iplink_xstats.c       |  6 +-----
 ip/ipmacsec.c            |  6 +-----
 ip/ipmaddr.c             |  7 +------
 ip/ipmonitor.c           |  7 +------
 ip/ipmroute.c            |  7 +------
 ip/ipneigh.c             |  7 +------
 ip/ipnetconf.c           |  7 +------
 ip/ipntable.c            | 18 ++----------------
 ip/ipprefix.c            | 17 ++---------------
 ip/iproute.c             |  7 +------
 ip/iproute_lwtunnel.c    |  7 +------
 ip/iprule.c              |  7 +------
 ip/ipseg6.c              |  5 +----
 ip/iptoken.c             |  6 +-----
 ip/iptunnel.c            |  7 +------
 ip/iptuntap.c            |  7 +------
 ip/ipvrf.c               |  7 +------
 ip/ipxfrm.c              | 20 ++------------------
 ip/link_gre.c            |  7 +------
 ip/link_gre6.c           |  7 +------
 ip/link_ip6tnl.c         |  7 +------
 ip/link_iptnl.c          |  7 +------
 ip/link_veth.c           |  7 +------
 ip/link_vti.c            |  6 +-----
 ip/link_vti6.c           |  6 +-----
 ip/rtm_map.c             |  7 +------
 ip/rtmon.c               |  7 +------
 ip/tcp_metrics.c         |  5 +----
 ip/tunnel.c              | 18 ++----------------
 ip/tunnel.h              | 15 +--------------
 ip/xfrm.h                | 17 +----------------
 ip/xfrm_monitor.c        | 20 ++------------------
 ip/xfrm_policy.c         | 20 ++------------------
 ip/xfrm_state.c          | 20 ++------------------
 60 files changed, 67 insertions(+), 432 deletions(-)

diff --git a/ip/ip.c b/ip/ip.c
index 863e42aad9eb..8424736f2904 100644
--- a/ip/ip.c
+++ b/ip/ip.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ip.c		"ip" utility frontend.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c
index 5399f91d3923..347bd46a6d98 100644
--- a/ip/ip6tunnel.c
+++ b/ip/ip6tunnel.c
@@ -1,20 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C)2006 USAGI/WIDE Project
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses>.
- */
-/*
  * Author:
  *	Masahide NAKAMURA @USAGI
  */
diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 5e8334823044..c7553bcdbc5e 100644
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ipaddress.c		"ip address".
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdarg.h>
diff --git a/ip/ipaddrlabel.c b/ip/ipaddrlabel.c
index beb08da3bfc2..46f68c41130c 100644
--- a/ip/ipaddrlabel.c
+++ b/ip/ipaddrlabel.c
@@ -1,26 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ipaddrlabel.c	"ip addrlabel"
  *
  * Copyright (C)2007 USAGI/WIDE Project
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses>.
- *
- *
  * Based on iprule.c.
  *
  * Authors:	YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
- *
  */
 
 #include <stdio.h>
diff --git a/ip/ipfou.c b/ip/ipfou.c
index 9c6977705c99..ed99a548412e 100644
--- a/ip/ipfou.c
+++ b/ip/ipfou.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ipfou.c	FOU (foo over UDP) support
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:	Tom Herbert <therbert@google.com>
  */
 
diff --git a/ip/ipila.c b/ip/ipila.c
index 475c35b5c4b0..335d15f68bae 100644
--- a/ip/ipila.c
+++ b/ip/ipila.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ipila.c	ILA (Identifier Locator Addressing) support
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:	Tom Herbert <tom@herbertland.com>
  */
 
diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c
index f1d574de31e3..87a4b898052d 100644
--- a/ip/ipl2tp.c
+++ b/ip/ipl2tp.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ipl2tp.c	       "ip l2tp"
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Original Author:	James Chapman <jchapman@katalix.com>
- *
  */
 
 #include <stdio.h>
diff --git a/ip/iplink.c b/ip/iplink.c
index e94dc6a51353..4ec9e370b107 100644
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink.c		"ip link".
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/ip/iplink_amt.c b/ip/iplink_amt.c
index 48e079f8b781..3a35bd9df9d1 100644
--- a/ip/iplink_amt.c
+++ b/ip/iplink_amt.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink_amt.c	AMT device support
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Taehee Yoo <ap420073@gmail.com>
  */
 
diff --git a/ip/iplink_batadv.c b/ip/iplink_batadv.c
index 45bd923f766d..27d316762e70 100644
--- a/ip/iplink_batadv.c
+++ b/ip/iplink_batadv.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink_batadv.c	Batman-adv support
  *
diff --git a/ip/iplink_bond.c b/ip/iplink_bond.c
index 7943499e0adf..214244daad2f 100644
--- a/ip/iplink_bond.c
+++ b/ip/iplink_bond.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink_bond.c	Bonding device support
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Jiri Pirko <jiri@resnulli.us>
  *              Scott Feldman <sfeldma@cumulusnetworks.com>
  */
diff --git a/ip/iplink_bond_slave.c b/ip/iplink_bond_slave.c
index 8103704bc9aa..ad6875006950 100644
--- a/ip/iplink_bond_slave.c
+++ b/ip/iplink_bond_slave.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink_bond_slave.c	Bonding slave device support
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Jiri Pirko <jiri@resnulli.us>
  */
 
diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
index 8b0c142294f6..7e4e62c81c0c 100644
--- a/ip/iplink_bridge.c
+++ b/ip/iplink_bridge.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink_bridge.c	Bridge device support
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Jiri Pirko <jiri@resnulli.us>
  */
 
diff --git a/ip/iplink_bridge_slave.c b/ip/iplink_bridge_slave.c
index ca4b264e64e7..43b429485502 100644
--- a/ip/iplink_bridge_slave.c
+++ b/ip/iplink_bridge_slave.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink_bridge_slave.c	Bridge slave device support
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Jiri Pirko <jiri@resnulli.us>
  */
 
diff --git a/ip/iplink_can.c b/ip/iplink_can.c
index 9bbe3d95876b..f2967db5d2b6 100644
--- a/ip/iplink_can.c
+++ b/ip/iplink_can.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink_can.c	CAN device support
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Wolfgang Grandegger <wg@grandegger.com>
  */
 
diff --git a/ip/iplink_geneve.c b/ip/iplink_geneve.c
index 98099cc9eece..62c61bce138b 100644
--- a/ip/iplink_geneve.c
+++ b/ip/iplink_geneve.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink_geneve.c	GENEVE device support
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     John W. Linville <linville@tuxdriver.com>
  */
 
diff --git a/ip/iplink_hsr.c b/ip/iplink_hsr.c
index da2d03d4bcbc..76f24a6ac3ed 100644
--- a/ip/iplink_hsr.c
+++ b/ip/iplink_hsr.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink_hsr.c	HSR device support
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Arvid Brodin <arvid.brodin@alten.se>
  *
  *		Based on iplink_vlan.c by Patrick McHardy <kaber@trash.net>
diff --git a/ip/iplink_ipoib.c b/ip/iplink_ipoib.c
index b730c5335020..7bf4e3215dd2 100644
--- a/ip/iplink_ipoib.c
+++ b/ip/iplink_ipoib.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink_ipoib.c	IPoIB device support
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Or Gerlitz <ogerlitz@mellanox.com>
  *		copied iflink_vlan.c authored by Patrick McHardy <kaber@trash.net>
  */
diff --git a/ip/iplink_ipvlan.c b/ip/iplink_ipvlan.c
index baae767b82c1..f29fa4f9e3eb 100644
--- a/ip/iplink_ipvlan.c
+++ b/ip/iplink_ipvlan.c
@@ -1,9 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /* iplink_ipvlan.c	IPVLAN/IPVTAP device support
- *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
  *
  * Authors:     Mahesh Bandewar <maheshb@google.com>
  */
diff --git a/ip/iplink_macvlan.c b/ip/iplink_macvlan.c
index 05e6bc77c8c3..0f13637d8fbc 100644
--- a/ip/iplink_macvlan.c
+++ b/ip/iplink_macvlan.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink_macvlan.c	macvlan/macvtap device support
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Patrick McHardy <kaber@trash.net>
  *		Arnd Bergmann <arnd@arndb.de>
  */
diff --git a/ip/iplink_netdevsim.c b/ip/iplink_netdevsim.c
index 34486081f6d4..5aaa775abad7 100644
--- a/ip/iplink_netdevsim.c
+++ b/ip/iplink_netdevsim.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/ip/iplink_vlan.c b/ip/iplink_vlan.c
index 1426f2afca23..4ac5bc03f2b3 100644
--- a/ip/iplink_vlan.c
+++ b/ip/iplink_vlan.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink_vlan.c	VLAN device support
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Patrick McHardy <kaber@trash.net>
  */
 
diff --git a/ip/iplink_vrf.c b/ip/iplink_vrf.c
index 5d20f29d3526..9474a2b78c5f 100644
--- a/ip/iplink_vrf.c
+++ b/ip/iplink_vrf.c
@@ -1,9 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /* iplink_vrf.c	VRF device support
- *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
  *
  * Authors:     Shrijeet Mukherjee <shm@cumulusnetworks.com>
  */
diff --git a/ip/iplink_vxcan.c b/ip/iplink_vxcan.c
index 8b08c9a70c65..e0f9bacbd3db 100644
--- a/ip/iplink_vxcan.c
+++ b/ip/iplink_vxcan.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink_vxcan.c	vxcan device support (Virtual CAN Tunnel)
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Author:	Oliver Hartkopp <socketcan@hartkopp.net>
  * Based on:	link_veth.c from Pavel Emelianov <xemul@openvz.org>
  */
diff --git a/ip/iplink_vxlan.c b/ip/iplink_vxlan.c
index 01522d6ebd02..c7e0e1c47606 100644
--- a/ip/iplink_vxlan.c
+++ b/ip/iplink_vxlan.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink_vxlan.c	VXLAN device support
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Stephen Hemminger <shemminger@vyatta.com
  */
 
diff --git a/ip/iplink_xdp.c b/ip/iplink_xdp.c
index 4a490bc8fb66..5928dff75b8a 100644
--- a/ip/iplink_xdp.c
+++ b/ip/iplink_xdp.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink_xdp.c XDP program loader
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Daniel Borkmann <daniel@iogearbox.net>
  */
 
diff --git a/ip/iplink_xstats.c b/ip/iplink_xstats.c
index 1d180b0bdada..6c184c02cb31 100644
--- a/ip/iplink_xstats.c
+++ b/ip/iplink_xstats.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iplink_stats.c       Extended statistics commands
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
  */
 
diff --git a/ip/ipmacsec.c b/ip/ipmacsec.c
index 6dd7382785a3..f3b2e03bdaeb 100644
--- a/ip/ipmacsec.c
+++ b/ip/ipmacsec.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ipmacsec.c		"ip macsec".
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Sabrina Dubroca <sd@queasysnail.net>
  */
 
diff --git a/ip/ipmaddr.c b/ip/ipmaddr.c
index d41ac63a74ec..f8d6b992d254 100644
--- a/ip/ipmaddr.c
+++ b/ip/ipmaddr.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ipmaddr.c		"ip maddress".
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/ip/ipmonitor.c b/ip/ipmonitor.c
index d808369c2898..9b055264ca7b 100644
--- a/ip/ipmonitor.c
+++ b/ip/ipmonitor.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ipmonitor.c		"ip monitor".
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/ip/ipmroute.c b/ip/ipmroute.c
index 32019c944c52..b6d9e618f284 100644
--- a/ip/ipmroute.c
+++ b/ip/ipmroute.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ipmroute.c		"ip mroute".
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/ip/ipneigh.c b/ip/ipneigh.c
index 0cf7bb60553a..ee14ffcccc46 100644
--- a/ip/ipneigh.c
+++ b/ip/ipneigh.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ipneigh.c		"ip neigh".
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/ip/ipnetconf.c b/ip/ipnetconf.c
index bb0ebe12da93..7ddaefb407ed 100644
--- a/ip/ipnetconf.c
+++ b/ip/ipnetconf.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ipnetconf.c		"ip netconf".
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Nicolas Dichtel, <nicolas.dichtel@6wind.com>
- *
  */
 
 #include <stdio.h>
diff --git a/ip/ipntable.c b/ip/ipntable.c
index 762c790d10fc..4ce02a315fe1 100644
--- a/ip/ipntable.c
+++ b/ip/ipntable.c
@@ -1,23 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C)2006 USAGI/WIDE Project
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses>.
- */
-/*
  * based on ipneigh.c
- */
-/*
+ *
  * Authors:
  *	Masahide NAKAMURA @USAGI
  */
diff --git a/ip/ipprefix.c b/ip/ipprefix.c
index 466af2088d90..ddf770146784 100644
--- a/ip/ipprefix.c
+++ b/ip/ipprefix.c
@@ -1,23 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C)2005 USAGI/WIDE Project
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
  *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses>.
- */
-/*
  * based on ip.c, iproute.c
- */
-/*
+ *
  * Authors:
  *	Masahide NAKAMURA @USAGI
  */
diff --git a/ip/iproute.c b/ip/iproute.c
index f34289e836ec..0bab0fdfae13 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iproute.c		"ip route".
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/ip/iproute_lwtunnel.c b/ip/iproute_lwtunnel.c
index bf4468b6db16..52221c6976b3 100644
--- a/ip/iproute_lwtunnel.c
+++ b/ip/iproute_lwtunnel.c
@@ -1,14 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iproute_lwtunnel.c
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Roopa Prabhu, <roopa@cumulusnetworks.com>
  *		Thomas Graf <tgraf@suug.ch>
- *
  */
 
 #include <stdio.h>
diff --git a/ip/iprule.c b/ip/iprule.c
index 8e5a2287ca6f..654ffffe3cc0 100644
--- a/ip/iprule.c
+++ b/ip/iprule.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iprule.c		"ip rule".
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/ip/ipseg6.c b/ip/ipseg6.c
index 4f541ae4232c..305b89614af5 100644
--- a/ip/ipseg6.c
+++ b/ip/ipseg6.c
@@ -1,10 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * seg6.c "ip sr/seg6"
  *
- *	  This program is free software; you can redistribute it and/or
- *	  modify it under the terms of the GNU General Public License
- *	  version 2 as published by the Free Software Foundation;
- *
  * Author: David Lebrun <david.lebrun@uclouvain.be>
  */
 
diff --git a/ip/iptoken.c b/ip/iptoken.c
index 9f35689006cf..f25a7c8b21f5 100644
--- a/ip/iptoken.c
+++ b/ip/iptoken.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iptoken.c    "ip token"
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Daniel Borkmann, <borkmann@redhat.com>
  */
 
diff --git a/ip/iptunnel.c b/ip/iptunnel.c
index 7a0e723714cc..02c3670b469d 100644
--- a/ip/iptunnel.c
+++ b/ip/iptunnel.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iptunnel.c	       "ip tunnel"
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/ip/iptuntap.c b/ip/iptuntap.c
index 8e4e09bff838..ab7d5d87a02d 100644
--- a/ip/iptuntap.c
+++ b/ip/iptuntap.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * iptunnel.c	       "ip tuntap"
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	David Woodhouse <David.Woodhouse@intel.com>
- *
  */
 
 #include <stdio.h>
diff --git a/ip/ipvrf.c b/ip/ipvrf.c
index 915780310cf1..0718bea8bba9 100644
--- a/ip/ipvrf.c
+++ b/ip/ipvrf.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ipvrf.c	"ip vrf"
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	David Ahern <dsa@cumulusnetworks.com>
- *
  */
 
 #include <sys/types.h>
diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c
index 7a1ebc9539b3..b78c712dfd73 100644
--- a/ip/ipxfrm.c
+++ b/ip/ipxfrm.c
@@ -1,25 +1,9 @@
-/* $USAGI: $ */
-
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C)2004 USAGI/WIDE Project
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses>.
- */
-/*
  * based on ip.c, iproute.c
- */
-/*
+ *
  * Authors:
  *	Masahide NAKAMURA @USAGI
  */
diff --git a/ip/link_gre.c b/ip/link_gre.c
index f462a227a507..74a5b5e9652a 100644
--- a/ip/link_gre.c
+++ b/ip/link_gre.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * link_gre.c	gre driver module
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Herbert Xu <herbert@gondor.apana.org.au>
- *
  */
 
 #include <string.h>
diff --git a/ip/link_gre6.c b/ip/link_gre6.c
index 232d9bde24d9..b03bd65adb53 100644
--- a/ip/link_gre6.c
+++ b/ip/link_gre6.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * link_gre6.c	gre driver module
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Dmitry Kozlov <xeb@mail.ru>
- *
  */
 
 #include <string.h>
diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c
index 2fcc13ef64d3..b27d696f565a 100644
--- a/ip/link_ip6tnl.c
+++ b/ip/link_ip6tnl.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * link_ip6tnl.c	ip6tnl driver module
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Nicolas Dichtel <nicolas.dichtel@6wind.com>
- *
  */
 
 #include <string.h>
diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
index b25855ba2004..1315aebe93f2 100644
--- a/ip/link_iptnl.c
+++ b/ip/link_iptnl.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * link_iptnl.c	ipip and sit driver module
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Nicolas Dichtel <nicolas.dichtel@6wind.com>
- *
  */
 
 #include <string.h>
diff --git a/ip/link_veth.c b/ip/link_veth.c
index 33e8f2b102e7..6da5b64f73ce 100644
--- a/ip/link_veth.c
+++ b/ip/link_veth.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * link_veth.c	veth driver module
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Pavel Emelianov <xemul@openvz.org>
- *
  */
 
 #include <string.h>
diff --git a/ip/link_vti.c b/ip/link_vti.c
index 3a52ea870b56..509432543fc5 100644
--- a/ip/link_vti.c
+++ b/ip/link_vti.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * link_vti.c	VTI driver module
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Herbert Xu <herbert@gondor.apana.org.au>
  *          Saurabh Mohan <saurabh.mohan@vyatta.com> Modified link_gre.c for VTI
  */
diff --git a/ip/link_vti6.c b/ip/link_vti6.c
index 0b080fa9f4dd..5764221ebb89 100644
--- a/ip/link_vti6.c
+++ b/ip/link_vti6.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * link_vti6.c	VTI driver module
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Herbert Xu <herbert@gondor.apana.org.au>
  *		Saurabh Mohan <saurabh.mohan@vyatta.com> Modified link_gre.c for VTI
  *		Steffen Klassert <steffen.klassert@secunet.com> Modified link_vti.c for IPv6
diff --git a/ip/rtm_map.c b/ip/rtm_map.c
index 8d8eafe0ae99..29463baedda0 100644
--- a/ip/rtm_map.c
+++ b/ip/rtm_map.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * rtm_map.c
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/ip/rtmon.c b/ip/rtmon.c
index b021f773d071..aad9968f967b 100644
--- a/ip/rtmon.c
+++ b/ip/rtmon.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * rtmon.c		RTnetlink listener.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/ip/tcp_metrics.c b/ip/tcp_metrics.c
index acbd745ab09e..9c8fb07240bf 100644
--- a/ip/tcp_metrics.c
+++ b/ip/tcp_metrics.c
@@ -1,10 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * tcp_metrics.c	"ip tcp_metrics/tcpmetrics"
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		version 2 as published by the Free Software Foundation;
- *
  * Authors:	Julian Anastasov <ja@ssi.bg>, August 2012
  */
 
diff --git a/ip/tunnel.c b/ip/tunnel.c
index 224c81e42e9b..75cb0b51e4c0 100644
--- a/ip/tunnel.c
+++ b/ip/tunnel.c
@@ -1,23 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C)2006 USAGI/WIDE Project
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses>.
- */
-/*
  * split from ip_tunnel.c
- */
-/*
+ *
  * Author:
  *	Masahide NAKAMURA @USAGI
  */
diff --git a/ip/tunnel.h b/ip/tunnel.h
index 604f8cbfd6db..0c9852e32364 100644
--- a/ip/tunnel.h
+++ b/ip/tunnel.h
@@ -1,20 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C)2006 USAGI/WIDE Project
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses>.
- */
-/*
  * Author:
  *	Masahide NAKAMURA @USAGI
  */
diff --git a/ip/xfrm.h b/ip/xfrm.h
index 6f251603f108..33c42730375d 100644
--- a/ip/xfrm.h
+++ b/ip/xfrm.h
@@ -1,22 +1,7 @@
-/* $USAGI: $ */
-
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C)2004 USAGI/WIDE Project
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses>.
- */
-/*
  * Authors:
  *	Masahide NAKAMURA @USAGI
  */
diff --git a/ip/xfrm_monitor.c b/ip/xfrm_monitor.c
index b0056d9de432..1f67fe9d14ff 100644
--- a/ip/xfrm_monitor.c
+++ b/ip/xfrm_monitor.c
@@ -1,25 +1,9 @@
-/* $USAGI: $ */
-
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C)2005 USAGI/WIDE Project
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses>.
- */
-/*
  * based on ipmonitor.c
- */
-/*
+ *
  * Authors:
  *	Masahide NAKAMURA @USAGI
  */
diff --git a/ip/xfrm_policy.c b/ip/xfrm_policy.c
index be5fcfed2027..be2235ca949d 100644
--- a/ip/xfrm_policy.c
+++ b/ip/xfrm_policy.c
@@ -1,25 +1,9 @@
-/* $USAGI: $ */
-
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C)2004 USAGI/WIDE Project
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses>.
- */
-/*
  * based on iproute.c
- */
-/*
+ *
  * Authors:
  *	Masahide NAKAMURA @USAGI
  */
diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c
index 16c65e23a7e7..aa0dce072dff 100644
--- a/ip/xfrm_state.c
+++ b/ip/xfrm_state.c
@@ -1,25 +1,9 @@
-/* $USAGI: $ */
-
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C)2004 USAGI/WIDE Project
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses>.
- */
-/*
  * based on iproute.c
- */
-/*
+ *
  * Authors:
  *	Masahide NAKAMURA @USAGI
  */
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 iproute2 06/11] testsuite: use SPDX
  2023-01-11 18:52 [PATCH v2 iproute2 00/11] SPDX cleanups Stephen Hemminger
                   ` (4 preceding siblings ...)
  2023-01-11 18:52 ` [PATCH v2 iproute2 05/11] ip: " Stephen Hemminger
@ 2023-01-11 18:52 ` Stephen Hemminger
  2023-01-11 18:52 ` [PATCH v2 iproute2 07/11] tipc: " Stephen Hemminger
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Stephen Hemminger @ 2023-01-11 18:52 UTC (permalink / raw)
  To: netdev; +Cc: Stephen Hemminger

Replace boilerplate with SPDX tag.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 testsuite/tools/generate_nlmsg.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/testsuite/tools/generate_nlmsg.c b/testsuite/tools/generate_nlmsg.c
index fe96f2622047..106dca63686f 100644
--- a/testsuite/tools/generate_nlmsg.c
+++ b/testsuite/tools/generate_nlmsg.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * generate_nlmsg.c	Testsuite helper generating nlmsg blob
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Phil Sutter <phil@nwl.cc>
  */
 
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 iproute2 07/11] tipc: use SPDX
  2023-01-11 18:52 [PATCH v2 iproute2 00/11] SPDX cleanups Stephen Hemminger
                   ` (5 preceding siblings ...)
  2023-01-11 18:52 ` [PATCH v2 iproute2 06/11] testsuite: " Stephen Hemminger
@ 2023-01-11 18:52 ` Stephen Hemminger
  2023-01-11 18:52 ` [PATCH v2 iproute2 08/11] tc: replace GPL-BSD boilerplate in codel and fq Stephen Hemminger
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Stephen Hemminger @ 2023-01-11 18:52 UTC (permalink / raw)
  To: netdev; +Cc: Stephen Hemminger

Replace boilerplate GPL text with SPDX

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 tipc/bearer.c    | 6 +-----
 tipc/bearer.h    | 6 +-----
 tipc/cmdl.c      | 6 +-----
 tipc/cmdl.h      | 6 +-----
 tipc/link.c      | 6 +-----
 tipc/link.h      | 6 +-----
 tipc/media.c     | 6 +-----
 tipc/media.h     | 6 +-----
 tipc/misc.c      | 6 +-----
 tipc/misc.h      | 6 +-----
 tipc/msg.c       | 6 +-----
 tipc/msg.h       | 6 +-----
 tipc/nametable.c | 6 +-----
 tipc/nametable.h | 6 +-----
 tipc/node.c      | 6 +-----
 tipc/node.h      | 6 +-----
 tipc/peer.c      | 6 +-----
 tipc/peer.h      | 6 +-----
 tipc/socket.c    | 6 +-----
 tipc/socket.h    | 6 +-----
 tipc/tipc.c      | 6 +-----
 21 files changed, 21 insertions(+), 105 deletions(-)

diff --git a/tipc/bearer.c b/tipc/bearer.c
index 968293bc9160..bb434f5f74bc 100644
--- a/tipc/bearer.c
+++ b/tipc/bearer.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * bearer.c	TIPC bearer functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/bearer.h b/tipc/bearer.h
index c0d099630b27..a93446592b26 100644
--- a/tipc/bearer.h
+++ b/tipc/bearer.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * bearer.h	TIPC bearer functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/cmdl.c b/tipc/cmdl.c
index feaac2da175f..152ddb517ebb 100644
--- a/tipc/cmdl.c
+++ b/tipc/cmdl.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * cmdl.c	Framework for handling command line options.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/cmdl.h b/tipc/cmdl.h
index dcade362e692..18fe51bf24a7 100644
--- a/tipc/cmdl.h
+++ b/tipc/cmdl.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * cmdl.h	Framework for handling command line options.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/link.c b/tipc/link.c
index 53f49c8937db..f91c300016f2 100644
--- a/tipc/link.c
+++ b/tipc/link.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * link.c	TIPC link functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/link.h b/tipc/link.h
index 6dc95e5b69b9..a0d4603580c5 100644
--- a/tipc/link.h
+++ b/tipc/link.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * link.c	TIPC link functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/media.c b/tipc/media.c
index a3fec681cbf4..5ff0c8c489f1 100644
--- a/tipc/media.c
+++ b/tipc/media.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * media.c	TIPC link functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/media.h b/tipc/media.h
index 8584af74b72e..f1b4b54055a2 100644
--- a/tipc/media.h
+++ b/tipc/media.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * media.h	TIPC link functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/misc.c b/tipc/misc.c
index 6175bf07d07c..32d4a5e0b1d1 100644
--- a/tipc/misc.c
+++ b/tipc/misc.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * misc.c	Miscellaneous TIPC helper functions.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/misc.h b/tipc/misc.h
index 59309f68f201..d00d7c9caa2b 100644
--- a/tipc/misc.h
+++ b/tipc/misc.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * misc.h	Miscellaneous TIPC helper functions.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/msg.c b/tipc/msg.c
index 1225691c9a81..731b0fa76784 100644
--- a/tipc/msg.c
+++ b/tipc/msg.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * msg.c	Messaging (netlink) helper functions.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/msg.h b/tipc/msg.h
index 56af5a705fb9..118a26647559 100644
--- a/tipc/msg.h
+++ b/tipc/msg.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * msg.h	Messaging (netlink) helper functions.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/nametable.c b/tipc/nametable.c
index b09ed5fc7280..5162f7fcf479 100644
--- a/tipc/nametable.c
+++ b/tipc/nametable.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * nametable.c	TIPC nametable functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/nametable.h b/tipc/nametable.h
index e0473e18e75b..c4df8d9d209a 100644
--- a/tipc/nametable.h
+++ b/tipc/nametable.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * nametable.h	TIPC nametable functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/node.c b/tipc/node.c
index bf592a074635..e645d374cd82 100644
--- a/tipc/node.c
+++ b/tipc/node.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * node.c	TIPC node functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/node.h b/tipc/node.h
index afee1fd06039..4a986d078bfb 100644
--- a/tipc/node.h
+++ b/tipc/node.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * node.h	TIPC node functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/peer.c b/tipc/peer.c
index ed18efc552fa..5a583fb9185e 100644
--- a/tipc/peer.c
+++ b/tipc/peer.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * peer.c	TIPC peer functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/peer.h b/tipc/peer.h
index 89722616529e..2bd0a2a37b15 100644
--- a/tipc/peer.h
+++ b/tipc/peer.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * peer.h	TIPC peer functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/socket.c b/tipc/socket.c
index 597ffd91af52..4d376e075885 100644
--- a/tipc/socket.c
+++ b/tipc/socket.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * socket.c	TIPC socket functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/socket.h b/tipc/socket.h
index 9d1b64872f53..c4341bb213d6 100644
--- a/tipc/socket.h
+++ b/tipc/socket.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * socket.h	TIPC socket functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/tipc.c b/tipc/tipc.c
index 9f23a4bfd25d..56af052cbbcd 100644
--- a/tipc/tipc.c
+++ b/tipc/tipc.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * tipc.	TIPC utility frontend.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 iproute2 08/11] tc: replace GPL-BSD boilerplate in codel and fq
  2023-01-11 18:52 [PATCH v2 iproute2 00/11] SPDX cleanups Stephen Hemminger
                   ` (6 preceding siblings ...)
  2023-01-11 18:52 ` [PATCH v2 iproute2 07/11] tipc: " Stephen Hemminger
@ 2023-01-11 18:52 ` Stephen Hemminger
  2023-01-11 18:52 ` [PATCH v2 iproute2 09/11] tc: use SPDX Stephen Hemminger
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Stephen Hemminger @ 2023-01-11 18:52 UTC (permalink / raw)
  To: netdev; +Cc: Stephen Hemminger

Replace legal boilerplate with SPDX instead.
These algorithms are dual licensed.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 tc/q_codel.c    | 32 +-------------------------------
 tc/q_fq.c       | 32 +-------------------------------
 tc/q_fq_codel.c | 32 +-------------------------------
 3 files changed, 3 insertions(+), 93 deletions(-)

diff --git a/tc/q_codel.c b/tc/q_codel.c
index c72a5779ba3b..03b6f92f117c 100644
--- a/tc/q_codel.c
+++ b/tc/q_codel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
  * Codel - The Controlled-Delay Active Queue Management algorithm
  *
@@ -5,37 +6,6 @@
  *  Copyright (C) 2011-2012 Van Jacobson <van@pollere.com>
  *  Copyright (C) 2012 Michael D. Taht <dave.taht@bufferbloat.net>
  *  Copyright (C) 2012,2015 Eric Dumazet <edumazet@google.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The names of the authors may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Alternatively, provided that this notice is retained in full, this
- * software may be distributed under the terms of the GNU General
- * Public License ("GPL") version 2, in which case the provisions of the
- * GPL apply INSTEAD OF those given above.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
  */
 
 #include <stdio.h>
diff --git a/tc/q_fq.c b/tc/q_fq.c
index 8dbfc41a1e05..0589800af0ea 100644
--- a/tc/q_fq.c
+++ b/tc/q_fq.c
@@ -1,38 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
  * Fair Queue
  *
  *  Copyright (C) 2013-2015 Eric Dumazet <edumazet@google.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The names of the authors may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Alternatively, provided that this notice is retained in full, this
- * software may be distributed under the terms of the GNU General
- * Public License ("GPL") version 2, in which case the provisions of the
- * GPL apply INSTEAD OF those given above.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
  */
 
 #include <stdio.h>
diff --git a/tc/q_fq_codel.c b/tc/q_fq_codel.c
index b7552e294fd0..9c9d7bc132a3 100644
--- a/tc/q_fq_codel.c
+++ b/tc/q_fq_codel.c
@@ -1,38 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
  * Fair Queue Codel
  *
  *  Copyright (C) 2012,2015 Eric Dumazet <edumazet@google.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The names of the authors may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Alternatively, provided that this notice is retained in full, this
- * software may be distributed under the terms of the GNU General
- * Public License ("GPL") version 2, in which case the provisions of the
- * GPL apply INSTEAD OF those given above.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
  */
 
 #include <stdio.h>
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 iproute2 09/11] tc: use SPDX
  2023-01-11 18:52 [PATCH v2 iproute2 00/11] SPDX cleanups Stephen Hemminger
                   ` (7 preceding siblings ...)
  2023-01-11 18:52 ` [PATCH v2 iproute2 08/11] tc: replace GPL-BSD boilerplate in codel and fq Stephen Hemminger
@ 2023-01-11 18:52 ` Stephen Hemminger
  2023-01-11 18:52 ` [PATCH v2 iproute2 10/11] misc: " Stephen Hemminger
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Stephen Hemminger @ 2023-01-11 18:52 UTC (permalink / raw)
  To: netdev; +Cc: Stephen Hemminger

Replace GPL boilerplate with SPDX.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 tc/e_bpf.c        |  6 +-----
 tc/em_canid.c     |  6 +-----
 tc/em_cmp.c       |  6 +-----
 tc/em_ipset.c     |  5 +----
 tc/em_ipt.c       |  5 +----
 tc/em_meta.c      |  6 +-----
 tc/em_nbyte.c     |  6 +-----
 tc/em_u32.c       |  6 +-----
 tc/emp_ematch.y   |  1 +
 tc/f_basic.c      |  7 +------
 tc/f_bpf.c        |  6 +-----
 tc/f_cgroup.c     |  7 +------
 tc/f_flow.c       |  6 +-----
 tc/f_flower.c     |  6 +-----
 tc/f_fw.c         |  7 +------
 tc/f_matchall.c   |  7 +------
 tc/f_route.c      |  7 +------
 tc/f_rsvp.c       |  7 +------
 tc/f_u32.c        |  6 +-----
 tc/m_action.c     |  6 +-----
 tc/m_bpf.c        |  6 +-----
 tc/m_connmark.c   | 13 +------------
 tc/m_csum.c       |  6 +-----
 tc/m_ematch.c     |  6 +-----
 tc/m_estimator.c  |  7 +------
 tc/m_gact.c       |  7 +------
 tc/m_ife.c        |  7 +------
 tc/m_ipt.c        |  6 +-----
 tc/m_mirred.c     |  7 +------
 tc/m_nat.c        |  7 +------
 tc/m_pedit.c      |  7 +------
 tc/m_pedit.h      |  5 +----
 tc/m_police.c     | 10 +---------
 tc/m_sample.c     |  7 +------
 tc/m_simple.c     |  6 +-----
 tc/m_skbedit.c    | 14 +-------------
 tc/m_skbmod.c     |  7 +------
 tc/m_tunnel_key.c |  6 +-----
 tc/m_vlan.c       |  6 +-----
 tc/m_xt.c         |  6 +-----
 tc/m_xt_old.c     |  6 +-----
 tc/p_eth.c        |  6 +-----
 tc/p_icmp.c       |  7 +------
 tc/p_ip.c         |  7 +------
 tc/p_ip6.c        |  7 +------
 tc/p_tcp.c        |  7 +------
 tc/p_udp.c        |  7 +------
 tc/q_atm.c        |  1 -
 tc/q_cbq.c        |  7 +------
 tc/q_cbs.c        |  7 +------
 tc/q_choke.c      |  6 +-----
 tc/q_drr.c        |  7 +------
 tc/q_dsmark.c     |  1 -
 tc/q_etf.c        |  7 +------
 tc/q_fifo.c       |  7 +------
 tc/q_gred.c       |  6 +-----
 tc/q_hfsc.c       |  7 +------
 tc/q_ingress.c    |  6 +-----
 tc/q_mqprio.c     |  6 +-----
 tc/q_multiq.c     | 13 +------------
 tc/q_pie.c        | 12 +-----------
 tc/q_prio.c       |  7 +------
 tc/q_qfq.c        |  6 +-----
 tc/q_red.c        |  7 +------
 tc/q_sfb.c        |  9 +--------
 tc/q_sfq.c        |  7 +------
 tc/q_skbprio.c    |  7 +------
 tc/q_taprio.c     |  6 +-----
 tc/q_tbf.c        |  7 +------
 tc/tc.c           | 10 +---------
 tc/tc_cbq.c       |  7 +------
 tc/tc_class.c     |  7 +------
 tc/tc_core.c      |  7 +------
 tc/tc_estimator.c |  7 +------
 tc/tc_exec.c      |  6 +-----
 tc/tc_filter.c    |  7 +------
 tc/tc_monitor.c   |  7 +------
 tc/tc_qdisc.c     |  6 +-----
 tc/tc_red.c       |  7 +------
 tc/tc_stab.c      |  7 +------
 tc/tc_util.c      |  7 +------
 81 files changed, 79 insertions(+), 467 deletions(-)

diff --git a/tc/e_bpf.c b/tc/e_bpf.c
index 517ee5b35734..79cddace96a4 100644
--- a/tc/e_bpf.c
+++ b/tc/e_bpf.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * e_bpf.c	BPF exec proxy
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Daniel Borkmann <daniel@iogearbox.net>
  */
 
diff --git a/tc/em_canid.c b/tc/em_canid.c
index 197c707f43bf..6d06b66a5944 100644
--- a/tc/em_canid.c
+++ b/tc/em_canid.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * em_canid.c  Ematch rule to match CAN frames according to their CAN identifiers
  *
- *             This program is free software; you can distribute it and/or
- *             modify it under the terms of the GNU General Public License
- *             as published by the Free Software Foundation; either version
- *             2 of the License, or (at your option) any later version.
- *
  * Idea:       Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
  * Copyright:  (c) 2011 Czech Technical University in Prague
  *             (c) 2011 Volkswagen Group Research
diff --git a/tc/em_cmp.c b/tc/em_cmp.c
index e051656f0bbb..dfd123df1e10 100644
--- a/tc/em_cmp.c
+++ b/tc/em_cmp.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * em_cmp.c		Simple comparison Ematch
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Thomas Graf <tgraf@suug.ch>
  */
 
diff --git a/tc/em_ipset.c b/tc/em_ipset.c
index 48b287f5ba3b..f97abaf3cfb7 100644
--- a/tc/em_ipset.c
+++ b/tc/em_ipset.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * em_ipset.c		IPset Ematch
  *
@@ -8,10 +9,6 @@
  *                         Patrick Schaaf <bof@bof.de>
  *                         Martin Josefsson <gandalf@wlug.westbo.se>
  * Copyright (C) 2003-2010 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <stdbool.h>
diff --git a/tc/em_ipt.c b/tc/em_ipt.c
index b15c3ba56df4..69efefd8c5e3 100644
--- a/tc/em_ipt.c
+++ b/tc/em_ipt.c
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * em_ipt.c		IPtables extensions matching Ematch
  *
  * (C) 2018 Eyal Birger <eyal.birger@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <getopt.h>
diff --git a/tc/em_meta.c b/tc/em_meta.c
index 2ddc65ed6cb6..6a5654f3a28b 100644
--- a/tc/em_meta.c
+++ b/tc/em_meta.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * em_meta.c		Metadata Ematch
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Thomas Graf <tgraf@suug.ch>
  */
 
diff --git a/tc/em_nbyte.c b/tc/em_nbyte.c
index 274d713ffac8..9f421fb423a6 100644
--- a/tc/em_nbyte.c
+++ b/tc/em_nbyte.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * em_nbyte.c		N-Byte Ematch
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Thomas Graf <tgraf@suug.ch>
  */
 
diff --git a/tc/em_u32.c b/tc/em_u32.c
index ea2bf882a12f..a83382ba4417 100644
--- a/tc/em_u32.c
+++ b/tc/em_u32.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * em_u32.c		U32 Ematch
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Thomas Graf <tgraf@suug.ch>
  */
 
diff --git a/tc/emp_ematch.y b/tc/emp_ematch.y
index 4da3daed095c..716877b6fc41 100644
--- a/tc/emp_ematch.y
+++ b/tc/emp_ematch.y
@@ -1,4 +1,5 @@
 %{
+/* SPDX-License-Identifier: GPL-2.0-or-later */
  #include <stdio.h>
  #include <stdlib.h>
  #include <malloc.h>
diff --git a/tc/f_basic.c b/tc/f_basic.c
index 9055370e90b9..1ceb15d404f3 100644
--- a/tc/f_basic.c
+++ b/tc/f_basic.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * f_basic.c		Basic Classifier
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Thomas Graf <tgraf@suug.ch>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/f_bpf.c b/tc/f_bpf.c
index 96e4576aa2f8..a6d4875fc057 100644
--- a/tc/f_bpf.c
+++ b/tc/f_bpf.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * f_bpf.c	BPF-based Classifier
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Daniel Borkmann <daniel@iogearbox.net>
  */
 
diff --git a/tc/f_cgroup.c b/tc/f_cgroup.c
index 633700e66aa8..a4fc03d1432e 100644
--- a/tc/f_cgroup.c
+++ b/tc/f_cgroup.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * f_cgroup.c		Control Group Classifier
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Thomas Graf <tgraf@infradead.org>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/f_flow.c b/tc/f_flow.c
index 9dd50df2e492..2445aaef51b3 100644
--- a/tc/f_flow.c
+++ b/tc/f_flow.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * f_flow.c		Flow filter
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Patrick McHardy <kaber@trash.net>
  */
 #include <stdio.h>
diff --git a/tc/f_flower.c b/tc/f_flower.c
index 4c0a194836f5..48cfafdbc3c0 100644
--- a/tc/f_flower.c
+++ b/tc/f_flower.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * f_flower.c		Flower Classifier
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:     Jiri Pirko <jiri@resnulli.us>
  */
 
diff --git a/tc/f_fw.c b/tc/f_fw.c
index 3c6ea93d2944..38bec492b49a 100644
--- a/tc/f_fw.c
+++ b/tc/f_fw.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * f_fw.c		FW filter.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/f_matchall.c b/tc/f_matchall.c
index 231d749e1f43..38b68d7e2450 100644
--- a/tc/f_matchall.c
+++ b/tc/f_matchall.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * f_matchall.c		Match-all Classifier
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Jiri Pirko <jiri@mellanox.com>, Yotam Gigi <yotamg@mellanox.com>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/f_route.c b/tc/f_route.c
index ad516b382ac0..e92c798574d8 100644
--- a/tc/f_route.c
+++ b/tc/f_route.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * f_route.c		ROUTE filter.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/f_rsvp.c b/tc/f_rsvp.c
index 0211c3f5e74b..84187d6207ca 100644
--- a/tc/f_rsvp.c
+++ b/tc/f_rsvp.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_rsvp.c		RSVP filter.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/f_u32.c b/tc/f_u32.c
index e4e0ab121c57..bfe9e5f98de4 100644
--- a/tc/f_u32.c
+++ b/tc/f_u32.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_u32.c		U32 filter.
  *
- *		This program is free software; you can u32istribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *		Match mark added by Catalin(ux aka Dino) BOIE <catab at umbrella.ro> [5 nov 2004]
  *
diff --git a/tc/m_action.c b/tc/m_action.c
index b3fd019350b2..7b12b6fc51d8 100644
--- a/tc/m_action.c
+++ b/tc/m_action.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_action.c		Action Management
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:  J Hadi Salim (hadi@cyberus.ca)
  *
  * TODO:
diff --git a/tc/m_bpf.c b/tc/m_bpf.c
index af5ba5ce45dc..4eadcb6daac4 100644
--- a/tc/m_bpf.c
+++ b/tc/m_bpf.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_bpf.c	BPF based action module
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Jiri Pirko <jiri@resnulli.us>
  *              Daniel Borkmann <daniel@iogearbox.net>
  */
diff --git a/tc/m_connmark.c b/tc/m_connmark.c
index 640bba9da18e..8506d95af5ec 100644
--- a/tc/m_connmark.c
+++ b/tc/m_connmark.c
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * m_connmark.c		Connection tracking marking import
  *
  * Copyright (c) 2011 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, see <http://www.gnu.org/licenses>.
  */
 
 #include <stdio.h>
diff --git a/tc/m_csum.c b/tc/m_csum.c
index 23c5972535c6..ba1e3e33b763 100644
--- a/tc/m_csum.c
+++ b/tc/m_csum.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_csum.c	checksum updating action
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors: Gregoire Baron <baronchon@n7mm.org>
  */
 
diff --git a/tc/m_ematch.c b/tc/m_ematch.c
index 8840a0dc62a1..e30ee20542d4 100644
--- a/tc/m_ematch.c
+++ b/tc/m_ematch.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_ematch.c		Extended Matches
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Thomas Graf <tgraf@suug.ch>
  */
 
diff --git a/tc/m_estimator.c b/tc/m_estimator.c
index b5f4c860c606..98fc5e73f3c6 100644
--- a/tc/m_estimator.c
+++ b/tc/m_estimator.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_estimator.c	Parse/print estimator module options.
  *
- *		This program is free software; you can u32istribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/m_gact.c b/tc/m_gact.c
index 2ef52cd10559..e294a701bfd1 100644
--- a/tc/m_gact.c
+++ b/tc/m_gact.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_gact.c		generic actions module
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:  J Hadi Salim (hadi@cyberus.ca)
- *
  */
 
 #include <stdio.h>
diff --git a/tc/m_ife.c b/tc/m_ife.c
index 70ab1d754fc5..162607ce7415 100644
--- a/tc/m_ife.c
+++ b/tc/m_ife.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_ife.c	IFE actions module
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:  J Hadi Salim (jhs@mojatatu.com)
- *
  */
 
 #include <stdio.h>
diff --git a/tc/m_ipt.c b/tc/m_ipt.c
index 046b310e64ab..465d1b8073d0 100644
--- a/tc/m_ipt.c
+++ b/tc/m_ipt.c
@@ -1,12 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_ipt.c	iptables based targets
  *		utilities mostly ripped from iptables <duh, its the linux way>
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:  J Hadi Salim (hadi@cyberus.ca)
  */
 
diff --git a/tc/m_mirred.c b/tc/m_mirred.c
index 38d8043baa46..e5653e67f791 100644
--- a/tc/m_mirred.c
+++ b/tc/m_mirred.c
@@ -1,15 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_egress.c		ingress/egress packet mirror/redir actions module
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:  J Hadi Salim (hadi@cyberus.ca)
  *
  * TODO: Add Ingress support
- *
  */
 
 #include <stdio.h>
diff --git a/tc/m_nat.c b/tc/m_nat.c
index 654f9a3bd95e..583151254f73 100644
--- a/tc/m_nat.c
+++ b/tc/m_nat.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_nat.c		NAT module
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Herbert Xu <herbert@gondor.apana.org.au>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/m_pedit.c b/tc/m_pedit.c
index 54949e431953..afdd020b92bc 100644
--- a/tc/m_pedit.c
+++ b/tc/m_pedit.c
@@ -1,18 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_pedit.c		generic packet editor actions module
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:  J Hadi Salim (hadi@cyberus.ca)
  *
  * TODO:
  *	1) Big endian broken in some spots
  *	2) A lot of this stuff was added on the fly; get a big double-double
  *	and clean it up at some point.
- *
  */
 
 #include <stdio.h>
diff --git a/tc/m_pedit.h b/tc/m_pedit.h
index 549bcf86a91f..8f3771e16255 100644
--- a/tc/m_pedit.h
+++ b/tc/m_pedit.h
@@ -1,10 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_pedit.h		generic packet editor actions module
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
  *
  * Authors:  J Hadi Salim (hadi@cyberus.ca)
  *
diff --git a/tc/m_police.c b/tc/m_police.c
index f38ab90a3039..46c39a818761 100644
--- a/tc/m_police.c
+++ b/tc/m_police.c
@@ -1,16 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_police.c		Parse/print policing module options.
  *
- *		This program is free software; you can u32istribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- * FIXES:       19990619 - J Hadi Salim (hadi@cyberus.ca)
- *		simple addattr packaging fix.
- *		2002: J Hadi Salim - Add tc action extensions syntax
- *
  */
 
 #include <stdio.h>
diff --git a/tc/m_sample.c b/tc/m_sample.c
index 696d76095ae6..769de144cbe0 100644
--- a/tc/m_sample.c
+++ b/tc/m_sample.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_sample.c		ingress/egress packet sampling module
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Yotam Gigi <yotamg@mellanox.com>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/m_simple.c b/tc/m_simple.c
index bc86be27cbcc..fe2bca21ae46 100644
--- a/tc/m_simple.c
+++ b/tc/m_simple.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_simple.c	simple action
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	J Hadi Salim <jhs@mojatatu.com>
  *
  * Pedagogical example. Adds a string that will be printed every time
diff --git a/tc/m_skbedit.c b/tc/m_skbedit.c
index 46d92b25582f..d55a6128494e 100644
--- a/tc/m_skbedit.c
+++ b/tc/m_skbedit.c
@@ -1,22 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * m_skbedit.c		SKB Editing module
  *
  * Copyright (c) 2008, Intel Corporation.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses>.
- *
  * Authors:	Alexander Duyck <alexander.h.duyck@intel.com>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/m_skbmod.c b/tc/m_skbmod.c
index 8d8bac5bc481..b1c8d00dfe47 100644
--- a/tc/m_skbmod.c
+++ b/tc/m_skbmod.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_skbmod.c	skb modifier action module
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:  J Hadi Salim (jhs@mojatatu.com)
- *
  */
 
 #include <stdio.h>
diff --git a/tc/m_tunnel_key.c b/tc/m_tunnel_key.c
index ca0dff119a49..1b4c8bd640eb 100644
--- a/tc/m_tunnel_key.c
+++ b/tc/m_tunnel_key.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_tunnel_key.c	ip tunnel manipulation module
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Amir Vadai <amir@vadai.me>
  */
 
diff --git a/tc/m_vlan.c b/tc/m_vlan.c
index 1b2b1d51ed2d..c1dc8b428e61 100644
--- a/tc/m_vlan.c
+++ b/tc/m_vlan.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_vlan.c		vlan manipulation module
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:     Jiri Pirko <jiri@resnulli.us>
  */
 
diff --git a/tc/m_xt.c b/tc/m_xt.c
index deaf96a26f75..8a6fd3ce0ffc 100644
--- a/tc/m_xt.c
+++ b/tc/m_xt.c
@@ -1,12 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_xt.c	xtables based targets
  *		utilities mostly ripped from iptables <duh, its the linux way>
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:  J Hadi Salim (hadi@cyberus.ca)
  */
 
diff --git a/tc/m_xt_old.c b/tc/m_xt_old.c
index db014898590d..efa084c5441b 100644
--- a/tc/m_xt_old.c
+++ b/tc/m_xt_old.c
@@ -1,12 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_xt.c	xtables based targets
  *		utilities mostly ripped from iptables <duh, its the linux way>
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:  J Hadi Salim (hadi@cyberus.ca)
  */
 
diff --git a/tc/p_eth.c b/tc/p_eth.c
index 7b6b61f809d3..b35e0c2b7c9a 100644
--- a/tc/p_eth.c
+++ b/tc/p_eth.c
@@ -1,13 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_pedit_eth.c	packet editor: ETH header
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
  *
  * Authors:  Amir Vadai (amir@vadai.me)
- *
  */
 
 #include <stdio.h>
diff --git a/tc/p_icmp.c b/tc/p_icmp.c
index 933ca8a5ff1e..074d02f43019 100644
--- a/tc/p_icmp.c
+++ b/tc/p_icmp.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_pedit_icmp.c	packet editor: ICMP header
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:  J Hadi Salim (hadi@cyberus.ca)
- *
  */
 
 #include <stdio.h>
diff --git a/tc/p_ip.c b/tc/p_ip.c
index 8eed9e8da57d..7f66ef3143fb 100644
--- a/tc/p_ip.c
+++ b/tc/p_ip.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * p_ip.c		packet editor: IPV4 header
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:  J Hadi Salim (hadi@cyberus.ca)
- *
  */
 
 #include <stdio.h>
diff --git a/tc/p_ip6.c b/tc/p_ip6.c
index f855c59e1f6b..3f8c23e46933 100644
--- a/tc/p_ip6.c
+++ b/tc/p_ip6.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * p_ip6.c		packet editor: IPV6 header
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:  Amir Vadai <amir@vadai.me>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/p_tcp.c b/tc/p_tcp.c
index ec7b08a28c07..43d7fb48c194 100644
--- a/tc/p_tcp.c
+++ b/tc/p_tcp.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_pedit_tcp.c	packet editor: TCP header
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:  J Hadi Salim (hadi@cyberus.ca)
- *
  */
 
 #include <stdio.h>
diff --git a/tc/p_udp.c b/tc/p_udp.c
index 742955e6d225..d98224fb3836 100644
--- a/tc/p_udp.c
+++ b/tc/p_udp.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * m_pedit_udp.c	packet editor: UDP header
  *
- *		This program is free software; you can distribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:  J Hadi Salim (hadi@cyberus.ca)
- *
  */
 
 #include <stdio.h>
diff --git a/tc/q_atm.c b/tc/q_atm.c
index 77b56825f777..07866ccf2fce 100644
--- a/tc/q_atm.c
+++ b/tc/q_atm.c
@@ -3,7 +3,6 @@
  * q_atm.c		ATM.
  *
  * Hacked 1998-2000 by Werner Almesberger, EPFL ICA
- *
  */
 
 #include <stdio.h>
diff --git a/tc/q_cbq.c b/tc/q_cbq.c
index 4619a37b8160..58afdca76a61 100644
--- a/tc/q_cbq.c
+++ b/tc/q_cbq.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_cbq.c		CBQ.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/q_cbs.c b/tc/q_cbs.c
index 13bb08e97e42..788535c6a022 100644
--- a/tc/q_cbs.c
+++ b/tc/q_cbs.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_cbs.c		CBS.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Vinicius Costa Gomes <vinicius.gomes@intel.com>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/q_choke.c b/tc/q_choke.c
index 570c3599e28b..7653eb7ef9c8 100644
--- a/tc/q_choke.c
+++ b/tc/q_choke.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_choke.c		CHOKE.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Stephen Hemminger <shemminger@vyatta.com>
  */
 
diff --git a/tc/q_drr.c b/tc/q_drr.c
index 4e829ce3331d..03c4744f6f26 100644
--- a/tc/q_drr.c
+++ b/tc/q_drr.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_drr.c		DRR.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Patrick McHardy <kaber@trash.net>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/q_dsmark.c b/tc/q_dsmark.c
index d3e8292d777c..9adceba59c99 100644
--- a/tc/q_dsmark.c
+++ b/tc/q_dsmark.c
@@ -3,7 +3,6 @@
  * q_dsmark.c		Differentiated Services field marking.
  *
  * Hacked 1998,1999 by Werner Almesberger, EPFL ICA
- *
  */
 
 #include <stdio.h>
diff --git a/tc/q_etf.c b/tc/q_etf.c
index c2090589bc64..572e2bc89fc1 100644
--- a/tc/q_etf.c
+++ b/tc/q_etf.c
@@ -1,14 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_etf.c		Earliest TxTime First (ETF).
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Vinicius Costa Gomes <vinicius.gomes@intel.com>
  *		Jesus Sanchez-Palencia <jesus.sanchez-palencia@intel.com>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/q_fifo.c b/tc/q_fifo.c
index ce82e74dcc5e..9b2c5348d375 100644
--- a/tc/q_fifo.c
+++ b/tc/q_fifo.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_fifo.c		FIFO.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/q_gred.c b/tc/q_gred.c
index 01f12eeeffad..f6a3f05eb95e 100644
--- a/tc/q_gred.c
+++ b/tc/q_gred.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_gred.c		GRED.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:    J Hadi Salim(hadi@nortelnetworks.com)
  *             code ruthlessly ripped from
  *	       Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
diff --git a/tc/q_hfsc.c b/tc/q_hfsc.c
index 81c10210c884..609d925a42e5 100644
--- a/tc/q_hfsc.c
+++ b/tc/q_hfsc.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_hfsc.c	HFSC.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Patrick McHardy, <kaber@trash.net>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/q_ingress.c b/tc/q_ingress.c
index 93313c9c2aec..3df4914c7d64 100644
--- a/tc/q_ingress.c
+++ b/tc/q_ingress.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_ingress.c             INGRESS.
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
  * Authors:    J Hadi Salim
  */
 
diff --git a/tc/q_mqprio.c b/tc/q_mqprio.c
index 706452d08092..99c43491e0be 100644
--- a/tc/q_mqprio.c
+++ b/tc/q_mqprio.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_mqprio.c	MQ prio qdisc
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Author:	John Fastabend, <john.r.fastabend@intel.com>
  */
 
diff --git a/tc/q_multiq.c b/tc/q_multiq.c
index 8ad9e0b2fa3c..b1e6c9a83708 100644
--- a/tc/q_multiq.c
+++ b/tc/q_multiq.c
@@ -1,20 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * q_multiq.c		Multiqueue aware qdisc
  *
  * Copyright (c) 2008, Intel Corporation.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses>.
- *
  * Author: Alexander Duyck <alexander.h.duyck@intel.com>
  *
  * Original Authors:	PJ Waskiewicz, <peter.p.waskiewicz.jr@intel.com> (RR)
diff --git a/tc/q_pie.c b/tc/q_pie.c
index 709a78b4c7c4..177cdcae0f2e 100644
--- a/tc/q_pie.c
+++ b/tc/q_pie.c
@@ -1,18 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /* Copyright (C) 2013 Cisco Systems, Inc, 2013.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License.
- *
- * This program 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 General Public License for more details.
  *
  * Author: Vijay Subramanian <vijaynsu@cisco.com>
  * Author: Mythili Prabhu <mysuryan@cisco.com>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/q_prio.c b/tc/q_prio.c
index a723a151bb7f..c8c6477e1a98 100644
--- a/tc/q_prio.c
+++ b/tc/q_prio.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_prio.c		PRIO.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/q_qfq.c b/tc/q_qfq.c
index eb8fa4b84927..c9955cc96a97 100644
--- a/tc/q_qfq.c
+++ b/tc/q_qfq.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_qfq.c	QFQ.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Stephen Hemminger <shemminger@vyatta.com>
  *		Fabio Checconi <fabio@gandalf.sssup.it>
  *
diff --git a/tc/q_red.c b/tc/q_red.c
index fd50d37d31cb..f760253d13b2 100644
--- a/tc/q_red.c
+++ b/tc/q_red.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_red.c		RED.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/q_sfb.c b/tc/q_sfb.c
index 8af55d98c36a..a2eef281e10f 100644
--- a/tc/q_sfb.c
+++ b/tc/q_sfb.c
@@ -1,17 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_sfb.c	Stochastic Fair Blue.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Juliusz Chroboczek <jch@pps.jussieu.fr>
- *
  */
 
-
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/tc/q_sfq.c b/tc/q_sfq.c
index d04a440cece7..17bf8f63f105 100644
--- a/tc/q_sfq.c
+++ b/tc/q_sfq.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_sfq.c		SFQ.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/q_skbprio.c b/tc/q_skbprio.c
index ca81a72cc8b1..b0ba180ab9c4 100644
--- a/tc/q_skbprio.c
+++ b/tc/q_skbprio.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_skbprio.c		SKB PRIORITY QUEUE.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Nishanth Devarajan, <ndev2021@gmail.com>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/q_taprio.c b/tc/q_taprio.c
index a7c01ae0cedb..e00d2aa9a842 100644
--- a/tc/q_taprio.c
+++ b/tc/q_taprio.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_taprio.c	Time Aware Priority Scheduler
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Vinicius Costa Gomes <vinicius.gomes@intel.com>
  * 		Jesus Sanchez-Palencia <jesus.sanchez-palencia@intel.com>
  */
diff --git a/tc/q_tbf.c b/tc/q_tbf.c
index 4e5bf382fd03..caea6bebd871 100644
--- a/tc/q_tbf.c
+++ b/tc/q_tbf.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * q_tbf.c		TBF.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/tc.c b/tc/tc.c
index 7557b9778111..258205004611 100644
--- a/tc/tc.c
+++ b/tc/tc.c
@@ -1,16 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * tc.c		"tc" utility frontend.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
- * Fixes:
- *
- * Petri Mattila <petri@prihateam.fi> 990308: wrong memset's resulted in faults
  */
 
 #include <stdio.h>
diff --git a/tc/tc_cbq.c b/tc/tc_cbq.c
index f56011ad1d07..7d1a44569f1d 100644
--- a/tc/tc_cbq.c
+++ b/tc/tc_cbq.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * tc_cbq.c		CBQ maintenance routines.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/tc_class.c b/tc/tc_class.c
index 409af2db7a3d..c1feb0098feb 100644
--- a/tc/tc_class.c
+++ b/tc/tc_class.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * tc_class.c		"tc class".
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/tc_core.c b/tc/tc_core.c
index 498d35dca8fb..8276f6a1f60b 100644
--- a/tc/tc_core.c
+++ b/tc/tc_core.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * tc_core.c		TC core library.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/tc_estimator.c b/tc/tc_estimator.c
index f494b7caa44e..275f254949d2 100644
--- a/tc/tc_estimator.c
+++ b/tc/tc_estimator.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * tc_core.c		TC core library.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/tc_exec.c b/tc/tc_exec.c
index 9b912ceb1916..5d8834029a0b 100644
--- a/tc/tc_exec.c
+++ b/tc/tc_exec.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * tc_exec.c	"tc exec".
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Daniel Borkmann <daniel@iogearbox.net>
  */
 
diff --git a/tc/tc_filter.c b/tc/tc_filter.c
index 71be2e8119c9..9617d28a831f 100644
--- a/tc/tc_filter.c
+++ b/tc/tc_filter.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * tc_filter.c		"tc filter".
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/tc_monitor.c b/tc/tc_monitor.c
index 64f31491607e..2573d744a0ee 100644
--- a/tc/tc_monitor.c
+++ b/tc/tc_monitor.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * tc_monitor.c		"tc monitor".
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Jamal Hadi Salim
- *
  */
 
 #include <stdio.h>
diff --git a/tc/tc_qdisc.c b/tc/tc_qdisc.c
index 33a6665eaac0..b97f21822e27 100644
--- a/tc/tc_qdisc.c
+++ b/tc/tc_qdisc.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * tc_qdisc.c		"tc qdisc".
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *		J Hadi Salim: Extension to ingress
  */
diff --git a/tc/tc_red.c b/tc/tc_red.c
index 88f5ff358ce5..700a9212f227 100644
--- a/tc/tc_red.c
+++ b/tc/tc_red.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * tc_red.c		RED maintenance routines.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/tc_stab.c b/tc/tc_stab.c
index 0f944003458d..a773372635e7 100644
--- a/tc/tc_stab.c
+++ b/tc/tc_stab.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * tc_stab.c		"tc qdisc ... stab *".
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Jussi Kivilinna, <jussi.kivilinna@mbnet.fi>
- *
  */
 
 #include <stdio.h>
diff --git a/tc/tc_util.c b/tc/tc_util.c
index d2622063a6d4..f72a19ca2757 100644
--- a/tc/tc_util.c
+++ b/tc/tc_util.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * tc_util.c		Misc TC utility functions.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 iproute2 10/11] misc: use SPDX
  2023-01-11 18:52 [PATCH v2 iproute2 00/11] SPDX cleanups Stephen Hemminger
                   ` (8 preceding siblings ...)
  2023-01-11 18:52 ` [PATCH v2 iproute2 09/11] tc: use SPDX Stephen Hemminger
@ 2023-01-11 18:52 ` Stephen Hemminger
  2023-01-11 18:52 ` [PATCH v2 iproute2 11/11] netem: add SPDX license header Stephen Hemminger
  2023-01-14 17:01 ` [PATCH v2 iproute2 00/11] SPDX cleanups patchwork-bot+netdevbpf
  11 siblings, 0 replies; 13+ messages in thread
From: Stephen Hemminger @ 2023-01-11 18:52 UTC (permalink / raw)
  To: netdev; +Cc: Stephen Hemminger

Use SPDX tag instead of GPL boilerplate.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 misc/arpd.c           | 6 +-----
 misc/ifstat.c         | 6 +-----
 misc/lnstat.c         | 7 +------
 misc/lnstat_util.c    | 7 +------
 misc/nstat.c          | 6 +-----
 misc/rtacct.c         | 7 +------
 misc/ss.c             | 6 +-----
 misc/ss_util.h        | 1 +
 misc/ssfilter.h       | 1 +
 misc/ssfilter.y       | 1 +
 misc/ssfilter_check.c | 1 +
 11 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/misc/arpd.c b/misc/arpd.c
index 504961cb5e3a..1ef837c61581 100644
--- a/misc/arpd.c
+++ b/misc/arpd.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * arpd.c	ARP helper daemon.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
diff --git a/misc/ifstat.c b/misc/ifstat.c
index 291f288b3752..4ce5ca8af4e7 100644
--- a/misc/ifstat.c
+++ b/misc/ifstat.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ifstat.c	handy utility to read net interface statistics
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
diff --git a/misc/lnstat.c b/misc/lnstat.c
index c3293a8eb12f..c3f2999cc255 100644
--- a/misc/lnstat.c
+++ b/misc/lnstat.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /* lnstat - Unified linux network statistics
  *
  * Copyright (C) 2004 by Harald Welte <laforge@gnumonks.org>
@@ -8,12 +9,6 @@
  *
  * Copyright 2001 by Robert Olsson <robert.olsson@its.uu.se>
  *                                 Uppsala University, Sweden
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
  */
 
 /* Maximum number of fields that can be displayed */
diff --git a/misc/lnstat_util.c b/misc/lnstat_util.c
index c2dc42ec1ff1..3f53e91afbf8 100644
--- a/misc/lnstat_util.c
+++ b/misc/lnstat_util.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /* lnstat.c:  Unified linux network statistics
  *
  * Copyright (C) 2004 by Harald Welte <laforge@gnumonks.org>
@@ -8,12 +9,6 @@
  *
  * Copyright 2001 by Robert Olsson <robert.olsson@its.uu.se>
  *                                 Uppsala University, Sweden
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
  */
 
 #include <unistd.h>
diff --git a/misc/nstat.c b/misc/nstat.c
index 7160c59be222..0ab92ecbeb47 100644
--- a/misc/nstat.c
+++ b/misc/nstat.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * nstat.c	handy utility to read counters /proc/net/netstat and snmp
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
diff --git a/misc/rtacct.c b/misc/rtacct.c
index 47b27e3fd88d..08363bfd4f26 100644
--- a/misc/rtacct.c
+++ b/misc/rtacct.c
@@ -1,13 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * rtacct.c		Applet to display contents of /proc/net/rt_acct.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
  */
 
 #include <stdio.h>
diff --git a/misc/ss.c b/misc/ss.c
index ccfa9fa9ef8e..de02fccb539b 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * ss.c		"sockstat", socket statistics
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
diff --git a/misc/ss_util.h b/misc/ss_util.h
index f7e40bb9b93c..37936c6623ea 100644
--- a/misc/ss_util.h
+++ b/misc/ss_util.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #ifndef __SS_UTIL_H__
 #define __SS_UTIL_H__
 
diff --git a/misc/ssfilter.h b/misc/ssfilter.h
index 0be3b1e03b9f..73e55e042b6b 100644
--- a/misc/ssfilter.h
+++ b/misc/ssfilter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #include <stdbool.h>
 
 enum {
diff --git a/misc/ssfilter.y b/misc/ssfilter.y
index 8e16b44638f6..3195723b2277 100644
--- a/misc/ssfilter.y
+++ b/misc/ssfilter.y
@@ -1,4 +1,5 @@
 %{
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/misc/ssfilter_check.c b/misc/ssfilter_check.c
index 38c960c1bc91..a188bb346999 100644
--- a/misc/ssfilter_check.c
+++ b/misc/ssfilter_check.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 iproute2 11/11] netem: add SPDX license header
  2023-01-11 18:52 [PATCH v2 iproute2 00/11] SPDX cleanups Stephen Hemminger
                   ` (9 preceding siblings ...)
  2023-01-11 18:52 ` [PATCH v2 iproute2 10/11] misc: " Stephen Hemminger
@ 2023-01-11 18:52 ` Stephen Hemminger
  2023-01-14 17:01 ` [PATCH v2 iproute2 00/11] SPDX cleanups patchwork-bot+netdevbpf
  11 siblings, 0 replies; 13+ messages in thread
From: Stephen Hemminger @ 2023-01-11 18:52 UTC (permalink / raw)
  To: netdev; +Cc: Stephen Hemminger

The netem directory contains code to generate tables for netem.
This code came from NISTnet which was public domain.
Add appropriate license tag.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 netem/maketable.c    | 1 +
 netem/normal.c       | 1 +
 netem/pareto.c       | 1 +
 netem/paretonormal.c | 1 +
 netem/stats.c        | 1 +
 5 files changed, 5 insertions(+)

diff --git a/netem/maketable.c b/netem/maketable.c
index ccb8f0c68b06..ad8620a47ce2 100644
--- a/netem/maketable.c
+++ b/netem/maketable.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: NIST-PD */
 /*
  * Experimental data  distribution table generator
  * Taken from the uncopyrighted NISTnet code (public domain).
diff --git a/netem/normal.c b/netem/normal.c
index 90963f4e91a4..5414be41fa52 100644
--- a/netem/normal.c
+++ b/netem/normal.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: NIST-PD */
 /*
  * Normal distribution table generator
  * Taken from the uncopyrighted NISTnet code.
diff --git a/netem/pareto.c b/netem/pareto.c
index 51d9437dbcb2..5c802c902baa 100644
--- a/netem/pareto.c
+++ b/netem/pareto.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: NIST-PD */
 /*
  * Pareto distribution table generator
  * Taken from the uncopyrighted NISTnet code.
diff --git a/netem/paretonormal.c b/netem/paretonormal.c
index 9773e370e6bc..c36e325fcd2b 100644
--- a/netem/paretonormal.c
+++ b/netem/paretonormal.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: NIST-PD */
 /*
  * Paretoormal distribution table generator
  *
diff --git a/netem/stats.c b/netem/stats.c
index ed70f1676342..99c4feedfa6f 100644
--- a/netem/stats.c
+++ b/netem/stats.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: NIST-PD */
 /*
  * Experimental data  distribution table generator
  * Taken from the uncopyrighted NISTnet code (public domain).
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [PATCH v2 iproute2 00/11] SPDX cleanups
  2023-01-11 18:52 [PATCH v2 iproute2 00/11] SPDX cleanups Stephen Hemminger
                   ` (10 preceding siblings ...)
  2023-01-11 18:52 ` [PATCH v2 iproute2 11/11] netem: add SPDX license header Stephen Hemminger
@ 2023-01-14 17:01 ` patchwork-bot+netdevbpf
  11 siblings, 0 replies; 13+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-01-14 17:01 UTC (permalink / raw)
  To: Stephen Hemminger; +Cc: netdev

Hello:

This series was applied to iproute2/iproute2.git (main)
by Stephen Hemminger <stephen@networkplumber.org>:

On Wed, 11 Jan 2023 10:52:16 -0800 you wrote:
> Cleanout the GPL boiler plate in iproute.
> Better to use modern SPDX to document the license
> rather than copy/paste same text in multiple places.
> 
> There is no change in licensing here, and none is planned.
> 
> v2 rebase and found some more missing SPDX places
> 
> [...]

Here is the summary with links:
  - [v2,iproute2,01/11] bridge: use SPDX
    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=9458a2c1f568
  - [v2,iproute2,02/11] genl: use SPDX
    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=8aa217546e9e
  - [v2,iproute2,03/11] lib: replace GPL boilerplate with SPDX
    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=9e7e786ae49a
  - [v2,iproute2,04/11] devlink: use SPDX
    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=18a13ec516a3
  - [v2,iproute2,05/11] ip: use SPDX
    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=c37d21944bca
  - [v2,iproute2,06/11] testsuite: use SPDX
    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=2a5fb175fa01
  - [v2,iproute2,07/11] tipc: use SPDX
    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=d2c5676eec06
  - [v2,iproute2,08/11] tc: replace GPL-BSD boilerplate in codel and fq
    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=01bdedff993b
  - [v2,iproute2,09/11] tc: use SPDX
    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=b3a091d10004
  - [v2,iproute2,10/11] misc: use SPDX
    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=6af63cc73287
  - [v2,iproute2,11/11] netem: add SPDX license header
    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=07b65f312f59

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2023-01-14 17:02 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-11 18:52 [PATCH v2 iproute2 00/11] SPDX cleanups Stephen Hemminger
2023-01-11 18:52 ` [PATCH v2 iproute2 01/11] bridge: use SPDX Stephen Hemminger
2023-01-11 18:52 ` [PATCH v2 iproute2 02/11] genl: " Stephen Hemminger
2023-01-11 18:52 ` [PATCH v2 iproute2 03/11] lib: replace GPL boilerplate with SPDX Stephen Hemminger
2023-01-11 18:52 ` [PATCH v2 iproute2 04/11] devlink: use SPDX Stephen Hemminger
2023-01-11 18:52 ` [PATCH v2 iproute2 05/11] ip: " Stephen Hemminger
2023-01-11 18:52 ` [PATCH v2 iproute2 06/11] testsuite: " Stephen Hemminger
2023-01-11 18:52 ` [PATCH v2 iproute2 07/11] tipc: " Stephen Hemminger
2023-01-11 18:52 ` [PATCH v2 iproute2 08/11] tc: replace GPL-BSD boilerplate in codel and fq Stephen Hemminger
2023-01-11 18:52 ` [PATCH v2 iproute2 09/11] tc: use SPDX Stephen Hemminger
2023-01-11 18:52 ` [PATCH v2 iproute2 10/11] misc: " Stephen Hemminger
2023-01-11 18:52 ` [PATCH v2 iproute2 11/11] netem: add SPDX license header Stephen Hemminger
2023-01-14 17:01 ` [PATCH v2 iproute2 00/11] SPDX cleanups patchwork-bot+netdevbpf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).