Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[sfrench/cifs-2.6.git] / net / ipv6 / tcp_ipv6.c

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index f4e609a48e68442693936050c2336ca1e80e1710..d8d18386c99a82e112dd3a1aeee01e4c328ba5d7 100644 (file)
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *     TCP over IPv6
  *     Linux INET6 implementation
@@ -16,11 +17,6 @@
  *     Alexey Kuznetsov                allow both IPv4 and IPv6 sockets to bind
  *                                     a single port at the same time.
  *     YOSHIFUJI Hideaki @USAGI:       convert /proc/net/tcp6 to seq_file.
- *
- *     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 <linux/bottom_half.h>