Commit 7a5d48c4 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next 

Florian Westphal says:

====================
netfilter patches for net-next

Remove GPL license copypastry in uapi files, those have SPDX tags.
From Christophe Jaillet.

Remove unused variable in rpfilter, from Guillaume Nault.

Rework gc resched delay computation in conntrack, from Antoine Tenart.

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next:
  netfilter: rpfilter: Remove unused variable 'ret'.
  headers: Remove some left-over license text in include/uapi/linux/netfilter/
  netfilter: conntrack: revisit the gc initial rescheduling bias
  netfilter: conntrack: fix the gc rescheduling delay
====================

Link: https://lore.kernel.org/r/20220921095000.29569-1-fw@strlen.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 393d34cb 72f5c898

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

net/ipv4/netfilter/ipt_rpfilter.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ static bool rpfilter_lookup_reverse(struct net *net, struct flowi4 *fl4, 
				const struct net_device *dev, u8 flags)

{

	struct fib_result res;

	int ret __maybe_unused;



	if (fib_lookup(net, fl4, &res, FIB_LOOKUP_IGNORE_LINKSTATE))

		return false;