Commit 7b5541a9 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Florian Westphal
Browse files

headers: Remove some left-over license text in include/uapi/linux/netfilter/ 



When the SPDX-License-Identifier tag has been added, the corresponding
license text has not been removed.

Remove it now.

Also, in xt_connmark.h, move the copyright text at the top of the file
which is a much more common pattern.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
parent 2aa19275

include/uapi/linux/netfilter/ipset/ip_set.h

+0 −4
Original line number Diff line number Diff line
@@ -3,10 +3,6 @@ 
 *                         Patrick Schaaf <bof@bof.de>

 *                         Martin Josefsson <gandalf@wlug.westbo.se>

 * Copyright (C) 2003-2011 Jozsef Kadlecsik <kadlec@netfilter.org>

 *

 * 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.

 */

#ifndef _UAPI_IP_SET_H

#define _UAPI_IP_SET_H

include/uapi/linux/netfilter/xt_AUDIT.h

+0 −4
Original line number Diff line number Diff line
@@ -4,10 +4,6 @@ 
 *

 * (C) 2010-2011 Thomas Graf <tgraf@redhat.com>

 * (C) 2010-2011 Red Hat, Inc.

 *

 * 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.

 */



#ifndef _XT_AUDIT_TARGET_H

include/uapi/linux/netfilter/xt_connmark.h

+4 −9
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */

/* Copyright (C) 2002,2004 MARA Systems AB <https://www.marasystems.com>

 * by Henrik Nordstrom <hno@marasystems.com>

 */



#ifndef _XT_CONNMARK_H

#define _XT_CONNMARK_H



#include <linux/types.h>



/* Copyright (C) 2002,2004 MARA Systems AB <https://www.marasystems.com>

 * by Henrik Nordstrom <hno@marasystems.com>

 *

 * 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.

 */



enum {

	XT_CONNMARK_SET = 0,

	XT_CONNMARK_SAVE,

include/uapi/linux/netfilter/xt_osf.h

+0 −14
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */

/*

 * Copyright (c) 2003+ Evgeniy Polyakov <johnpol@2ka.mxt.ru>

 *

 *

 * 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/>.

 */



#ifndef _XT_OSF_H