From: Stephen Hemminger Date: Wed, 11 Jan 2023 03:05:49 +0000 (-0800) Subject: tc: use SPDX X-Git-Tag: v6.2.0~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3a091d1000444478d4857f5158557b00aaded29;p=thirdparty%2Fiproute2.git tc: use SPDX Replace GPL boilerplate with SPDX. Signed-off-by: Stephen Hemminger --- diff --git a/tc/e_bpf.c b/tc/e_bpf.c index 517ee5b35..79cddace9 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 */ diff --git a/tc/em_canid.c b/tc/em_canid.c index 197c707f4..6d06b66a5 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 * 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 e051656f0..dfd123df1 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 */ diff --git a/tc/em_ipset.c b/tc/em_ipset.c index 48b287f5b..f97abaf3c 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 * Martin Josefsson * Copyright (C) 2003-2010 Jozsef Kadlecsik - * - * 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 diff --git a/tc/em_ipt.c b/tc/em_ipt.c index b15c3ba56..69efefd8c 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 - * - * 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 diff --git a/tc/em_meta.c b/tc/em_meta.c index 2ddc65ed6..6a5654f3a 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 */ diff --git a/tc/em_nbyte.c b/tc/em_nbyte.c index 274d713ff..9f421fb42 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 */ diff --git a/tc/em_u32.c b/tc/em_u32.c index ea2bf882a..a83382ba4 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 */ diff --git a/tc/emp_ematch.y b/tc/emp_ematch.y index 4da3daed0..716877b6f 100644 --- a/tc/emp_ematch.y +++ b/tc/emp_ematch.y @@ -1,4 +1,5 @@ %{ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include #include #include diff --git a/tc/f_basic.c b/tc/f_basic.c index 9055370e9..1ceb15d40 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 - * */ #include diff --git a/tc/f_bpf.c b/tc/f_bpf.c index 96e4576aa..a6d4875fc 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 */ diff --git a/tc/f_cgroup.c b/tc/f_cgroup.c index 633700e66..a4fc03d14 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 - * */ #include diff --git a/tc/f_flow.c b/tc/f_flow.c index 9dd50df2e..2445aaef5 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 */ #include diff --git a/tc/f_flower.c b/tc/f_flower.c index 4c0a19483..48cfafdbc 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 */ diff --git a/tc/f_fw.c b/tc/f_fw.c index 3c6ea93d2..38bec492b 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, - * */ #include diff --git a/tc/f_matchall.c b/tc/f_matchall.c index 231d749e1..38b68d7e2 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 , Yotam Gigi - * */ #include diff --git a/tc/f_route.c b/tc/f_route.c index ad516b382..e92c79857 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, - * */ #include diff --git a/tc/f_rsvp.c b/tc/f_rsvp.c index 0211c3f5e..84187d620 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, - * */ #include diff --git a/tc/f_u32.c b/tc/f_u32.c index e4e0ab121..bfe9e5f98 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, * Match mark added by Catalin(ux aka Dino) BOIE [5 nov 2004] * diff --git a/tc/m_action.c b/tc/m_action.c index b3fd01935..7b12b6fc5 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 af5ba5ce4..4eadcb6da 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 * Daniel Borkmann */ diff --git a/tc/m_connmark.c b/tc/m_connmark.c index 640bba9da..8506d95af 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 - * - * 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 . */ #include diff --git a/tc/m_csum.c b/tc/m_csum.c index 23c597253..ba1e3e33b 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 */ diff --git a/tc/m_ematch.c b/tc/m_ematch.c index 8840a0dc6..e30ee2054 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 */ diff --git a/tc/m_estimator.c b/tc/m_estimator.c index b5f4c860c..98fc5e73f 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, - * */ #include diff --git a/tc/m_gact.c b/tc/m_gact.c index 2ef52cd10..e294a701b 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 diff --git a/tc/m_ife.c b/tc/m_ife.c index 70ab1d754..162607ce7 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 diff --git a/tc/m_ipt.c b/tc/m_ipt.c index 046b310e6..465d1b807 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 * - * 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 38d8043ba..e5653e67f 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 diff --git a/tc/m_nat.c b/tc/m_nat.c index 654f9a3bd..583151254 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 - * */ #include diff --git a/tc/m_pedit.c b/tc/m_pedit.c index 54949e431..afdd020b9 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 diff --git a/tc/m_pedit.h b/tc/m_pedit.h index 549bcf86a..8f3771e16 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 f38ab90a3..46c39a818 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, - * FIXES: 19990619 - J Hadi Salim (hadi@cyberus.ca) - * simple addattr packaging fix. - * 2002: J Hadi Salim - Add tc action extensions syntax - * */ #include diff --git a/tc/m_sample.c b/tc/m_sample.c index 696d76095..769de144c 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 - * */ #include diff --git a/tc/m_simple.c b/tc/m_simple.c index bc86be27c..fe2bca21a 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 * * Pedagogical example. Adds a string that will be printed every time diff --git a/tc/m_skbedit.c b/tc/m_skbedit.c index 46d92b255..d55a61284 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 . - * * Authors: Alexander Duyck - * */ #include diff --git a/tc/m_skbmod.c b/tc/m_skbmod.c index 8d8bac5bc..b1c8d00df 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 diff --git a/tc/m_tunnel_key.c b/tc/m_tunnel_key.c index ca0dff119..1b4c8bd64 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 */ diff --git a/tc/m_vlan.c b/tc/m_vlan.c index 1b2b1d51e..c1dc8b428 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 */ diff --git a/tc/m_xt.c b/tc/m_xt.c index deaf96a26..8a6fd3ce0 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 * - * 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 db0148985..efa084c54 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 * - * 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 7b6b61f80..b35e0c2b7 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 diff --git a/tc/p_icmp.c b/tc/p_icmp.c index 933ca8a5f..074d02f43 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 diff --git a/tc/p_ip.c b/tc/p_ip.c index 8eed9e8da..7f66ef314 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 diff --git a/tc/p_ip6.c b/tc/p_ip6.c index f855c59e1..3f8c23e46 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 - * */ #include diff --git a/tc/p_tcp.c b/tc/p_tcp.c index ec7b08a28..43d7fb48c 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 diff --git a/tc/p_udp.c b/tc/p_udp.c index 742955e6d..d98224fb3 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 diff --git a/tc/q_atm.c b/tc/q_atm.c index 77b56825f..07866ccf2 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 diff --git a/tc/q_cbq.c b/tc/q_cbq.c index 4619a37b8..58afdca76 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, - * */ #include diff --git a/tc/q_cbs.c b/tc/q_cbs.c index 13bb08e97..788535c6a 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 - * */ #include diff --git a/tc/q_choke.c b/tc/q_choke.c index 570c3599e..7653eb7ef 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 */ diff --git a/tc/q_drr.c b/tc/q_drr.c index 4e829ce33..03c4744f6 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 - * */ #include diff --git a/tc/q_dsmark.c b/tc/q_dsmark.c index d3e8292d7..9adceba59 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 diff --git a/tc/q_etf.c b/tc/q_etf.c index c2090589b..572e2bc89 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 * Jesus Sanchez-Palencia - * */ #include diff --git a/tc/q_fifo.c b/tc/q_fifo.c index ce82e74dc..9b2c5348d 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, - * */ #include diff --git a/tc/q_gred.c b/tc/q_gred.c index 01f12eeef..f6a3f05eb 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, diff --git a/tc/q_hfsc.c b/tc/q_hfsc.c index 81c10210c..609d925a4 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, - * */ #include diff --git a/tc/q_ingress.c b/tc/q_ingress.c index 93313c9c2..3df4914c7 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 706452d08..99c43491e 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, */ diff --git a/tc/q_multiq.c b/tc/q_multiq.c index 8ad9e0b2f..b1e6c9a83 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 . - * * Author: Alexander Duyck * * Original Authors: PJ Waskiewicz, (RR) diff --git a/tc/q_pie.c b/tc/q_pie.c index 709a78b4c..177cdcae0 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 * Author: Mythili Prabhu - * */ #include diff --git a/tc/q_prio.c b/tc/q_prio.c index a723a151b..c8c6477e1 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, - * */ #include diff --git a/tc/q_qfq.c b/tc/q_qfq.c index eb8fa4b84..c9955cc96 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 * Fabio Checconi * diff --git a/tc/q_red.c b/tc/q_red.c index fd50d37d3..f760253d1 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, - * */ #include diff --git a/tc/q_sfb.c b/tc/q_sfb.c index 8af55d98c..a2eef281e 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 - * */ - - #include #include #include diff --git a/tc/q_sfq.c b/tc/q_sfq.c index d04a440ce..17bf8f63f 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, - * */ #include diff --git a/tc/q_skbprio.c b/tc/q_skbprio.c index ca81a72cc..b0ba180ab 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, - * */ #include diff --git a/tc/q_taprio.c b/tc/q_taprio.c index a7c01ae0c..e00d2aa9a 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 * Jesus Sanchez-Palencia */ diff --git a/tc/q_tbf.c b/tc/q_tbf.c index 4e5bf382f..caea6bebd 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, - * */ #include diff --git a/tc/tc.c b/tc/tc.c index 7557b9778..258205004 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, - * - * Fixes: - * - * Petri Mattila 990308: wrong memset's resulted in faults */ #include diff --git a/tc/tc_cbq.c b/tc/tc_cbq.c index f56011ad1..7d1a44569 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, - * */ #include diff --git a/tc/tc_class.c b/tc/tc_class.c index 409af2db7..c1feb0098 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, - * */ #include diff --git a/tc/tc_core.c b/tc/tc_core.c index 498d35dca..8276f6a1f 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, - * */ #include diff --git a/tc/tc_estimator.c b/tc/tc_estimator.c index f494b7caa..275f25494 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, - * */ #include diff --git a/tc/tc_exec.c b/tc/tc_exec.c index 9b912ceb1..5d8834029 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 */ diff --git a/tc/tc_filter.c b/tc/tc_filter.c index 71be2e811..9617d28a8 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, - * */ #include diff --git a/tc/tc_monitor.c b/tc/tc_monitor.c index 64f314916..2573d744a 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 diff --git a/tc/tc_qdisc.c b/tc/tc_qdisc.c index 33a6665ea..b97f21822 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, * J Hadi Salim: Extension to ingress */ diff --git a/tc/tc_red.c b/tc/tc_red.c index 88f5ff358..700a9212f 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, - * */ #include diff --git a/tc/tc_stab.c b/tc/tc_stab.c index 0f9440034..a77337263 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, - * */ #include diff --git a/tc/tc_util.c b/tc/tc_util.c index d2622063a..f72a19ca2 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, - * */ #include