From: Stephen Hemminger Date: Wed, 11 Jan 2023 02:53:46 +0000 (-0800) Subject: ip: use SPDX X-Git-Tag: v6.2.0~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c37d21944bcad56c63a27664e4d3ab6d5a98f534;p=thirdparty%2Fiproute2.git ip: use SPDX Use SPDX instead of boilerplate text for ip and related sub commands. Signed-off-by: Stephen Hemminger --- diff --git a/ip/ip.c b/ip/ip.c index 863e42aad..8424736f2 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, */ diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c index 5399f91d3..347bd46a6 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 . - */ -/* * Author: * Masahide NAKAMURA @USAGI */ diff --git a/ip/ipaddress.c b/ip/ipaddress.c index 5e8334823..c7553bcdb 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, - * */ #include diff --git a/ip/ipaddrlabel.c b/ip/ipaddrlabel.c index beb08da3b..46f68c411 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 . - * - * * Based on iprule.c. * * Authors: YOSHIFUJI Hideaki - * */ #include diff --git a/ip/ipfou.c b/ip/ipfou.c index 9c6977705..ed99a5484 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 */ diff --git a/ip/ipila.c b/ip/ipila.c index 475c35b5c..335d15f68 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 */ diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c index f1d574de3..87a4b8980 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 - * */ #include diff --git a/ip/iplink.c b/ip/iplink.c index e94dc6a51..4ec9e370b 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, - * */ #include diff --git a/ip/iplink_amt.c b/ip/iplink_amt.c index 48e079f8b..3a35bd9df 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 */ diff --git a/ip/iplink_batadv.c b/ip/iplink_batadv.c index 45bd923f7..27d316762 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 7943499e0..214244daa 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 * Scott Feldman */ diff --git a/ip/iplink_bond_slave.c b/ip/iplink_bond_slave.c index 8103704bc..ad6875006 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 */ diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c index 8b0c14229..7e4e62c81 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 */ diff --git a/ip/iplink_bridge_slave.c b/ip/iplink_bridge_slave.c index ca4b264e6..43b429485 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 */ diff --git a/ip/iplink_can.c b/ip/iplink_can.c index 9bbe3d958..f2967db5d 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 */ diff --git a/ip/iplink_geneve.c b/ip/iplink_geneve.c index 98099cc9e..62c61bce1 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 */ diff --git a/ip/iplink_hsr.c b/ip/iplink_hsr.c index da2d03d4b..76f24a6ac 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 * * Based on iplink_vlan.c by Patrick McHardy diff --git a/ip/iplink_ipoib.c b/ip/iplink_ipoib.c index b730c5335..7bf4e3215 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 * copied iflink_vlan.c authored by Patrick McHardy */ diff --git a/ip/iplink_ipvlan.c b/ip/iplink_ipvlan.c index baae767b8..f29fa4f9e 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 */ diff --git a/ip/iplink_macvlan.c b/ip/iplink_macvlan.c index 05e6bc77c..0f13637d8 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 * Arnd Bergmann */ diff --git a/ip/iplink_netdevsim.c b/ip/iplink_netdevsim.c index 34486081f..5aaa775ab 100644 --- a/ip/iplink_netdevsim.c +++ b/ip/iplink_netdevsim.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include #include diff --git a/ip/iplink_vlan.c b/ip/iplink_vlan.c index 1426f2afc..4ac5bc03f 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 */ diff --git a/ip/iplink_vrf.c b/ip/iplink_vrf.c index 5d20f29d3..9474a2b78 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 */ diff --git a/ip/iplink_vxcan.c b/ip/iplink_vxcan.c index 8b08c9a70..e0f9bacbd 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 * Based on: link_veth.c from Pavel Emelianov */ diff --git a/ip/iplink_vxlan.c b/ip/iplink_vxlan.c index 01522d6eb..c7e0e1c47 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 */ diff --git a/ip/iplink_xstats.c b/ip/iplink_xstats.c index 1d180b0bd..6c184c02c 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 */ diff --git a/ip/ipmacsec.c b/ip/ipmacsec.c index 6dd738278..f3b2e03bd 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 */ diff --git a/ip/ipmaddr.c b/ip/ipmaddr.c index d41ac63a7..f8d6b992d 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, - * */ #include diff --git a/ip/ipmonitor.c b/ip/ipmonitor.c index d808369c2..9b055264c 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, - * */ #include diff --git a/ip/ipmroute.c b/ip/ipmroute.c index 32019c944..b6d9e618f 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, - * */ #include diff --git a/ip/ipneigh.c b/ip/ipneigh.c index 0cf7bb605..ee14ffccc 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, - * */ #include diff --git a/ip/ipnetconf.c b/ip/ipnetconf.c index bb0ebe12d..7ddaefb40 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, - * */ #include diff --git a/ip/ipntable.c b/ip/ipntable.c index 762c790d1..4ce02a315 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 . - */ -/* * based on ipneigh.c - */ -/* + * * Authors: * Masahide NAKAMURA @USAGI */ diff --git a/ip/ipprefix.c b/ip/ipprefix.c index 466af2088..ddf770146 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 . - */ -/* * based on ip.c, iproute.c - */ -/* + * * Authors: * Masahide NAKAMURA @USAGI */ diff --git a/ip/iproute.c b/ip/iproute.c index f34289e83..0bab0fdfa 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, - * */ #include diff --git a/ip/iproute_lwtunnel.c b/ip/iproute_lwtunnel.c index bf4468b6d..52221c697 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, * Thomas Graf - * */ #include diff --git a/ip/iprule.c b/ip/iprule.c index 8e5a2287c..654ffffe3 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, - * */ #include diff --git a/ip/ipseg6.c b/ip/ipseg6.c index 4f541ae42..305b89614 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 */ diff --git a/ip/iptoken.c b/ip/iptoken.c index 9f3568900..f25a7c8b2 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, */ diff --git a/ip/iptunnel.c b/ip/iptunnel.c index 7a0e72371..02c3670b4 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, - * */ #include diff --git a/ip/iptuntap.c b/ip/iptuntap.c index 8e4e09bff..ab7d5d87a 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 - * */ #include diff --git a/ip/ipvrf.c b/ip/ipvrf.c index 915780310..0718bea8b 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 - * */ #include diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c index 7a1ebc953..b78c712df 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 . - */ -/* * based on ip.c, iproute.c - */ -/* + * * Authors: * Masahide NAKAMURA @USAGI */ diff --git a/ip/link_gre.c b/ip/link_gre.c index f462a227a..74a5b5e96 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 - * */ #include diff --git a/ip/link_gre6.c b/ip/link_gre6.c index 232d9bde2..b03bd65ad 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 - * */ #include diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c index 2fcc13ef6..b27d696f5 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 - * */ #include diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c index b25855ba2..1315aebe9 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 - * */ #include diff --git a/ip/link_veth.c b/ip/link_veth.c index 33e8f2b10..6da5b64f7 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 - * */ #include diff --git a/ip/link_vti.c b/ip/link_vti.c index 3a52ea870..509432543 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 * Saurabh Mohan Modified link_gre.c for VTI */ diff --git a/ip/link_vti6.c b/ip/link_vti6.c index 0b080fa9f..5764221eb 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 * Saurabh Mohan Modified link_gre.c for VTI * Steffen Klassert Modified link_vti.c for IPv6 diff --git a/ip/rtm_map.c b/ip/rtm_map.c index 8d8eafe0a..29463baed 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, - * */ #include diff --git a/ip/rtmon.c b/ip/rtmon.c index b021f773d..aad9968f9 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, - * */ #include diff --git a/ip/tcp_metrics.c b/ip/tcp_metrics.c index acbd745ab..9c8fb0724 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 , August 2012 */ diff --git a/ip/tunnel.c b/ip/tunnel.c index 224c81e42..75cb0b51e 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 . - */ -/* * split from ip_tunnel.c - */ -/* + * * Author: * Masahide NAKAMURA @USAGI */ diff --git a/ip/tunnel.h b/ip/tunnel.h index 604f8cbfd..0c9852e32 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 . - */ -/* * Author: * Masahide NAKAMURA @USAGI */ diff --git a/ip/xfrm.h b/ip/xfrm.h index 6f251603f..33c427303 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 . - */ -/* * Authors: * Masahide NAKAMURA @USAGI */ diff --git a/ip/xfrm_monitor.c b/ip/xfrm_monitor.c index b0056d9de..1f67fe9d1 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 . - */ -/* * based on ipmonitor.c - */ -/* + * * Authors: * Masahide NAKAMURA @USAGI */ diff --git a/ip/xfrm_policy.c b/ip/xfrm_policy.c index be5fcfed2..be2235ca9 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 . - */ -/* * based on iproute.c - */ -/* + * * Authors: * Masahide NAKAMURA @USAGI */ diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c index 16c65e23a..aa0dce072 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 . - */ -/* * based on iproute.c - */ -/* + * * Authors: * Masahide NAKAMURA @USAGI */