Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27d92807 authored by David S. Miller's avatar David S. Miller
Browse files


Pablo Neira Ayuso says:

====================
Netfilter updates for net-next

The following patches contains Netfilter updates for net-next:

1) .br_defrag indirection depends on CONFIG_NF_DEFRAG_IPV6, from wenxu.

2) Remove unnecessary memset() in ipset, from Florent Fourcot.

3) Merge control plane addition and deletion in ipset, also from Florent.

4) A few missing check for nla_parse() in ipset, from Aditya Pakki
   and Jozsef Kadlecsik.

5) Incorrect cleanup in error path of xt_set version 3, from Jozsef.

6) Memory accounting problems when resizing in ipset, from Stefano Brivio.

7) Jozsef updates his email to @netfilter.org, this batch comes with a
   conflict resolution with recent SPDX header updates.

8) Add to create custom conntrack expectations via nftables, from
   Stephane Veyret.

9) A lookup optimization for conntrack, from Florian Westphal.

10) Check for supported flags in xt_owner.

11) Support for pernet sysctl in br_netfilter, patches
    from Christian Brauner.

12) Patches to move common synproxy infrastructure to nf_synproxy.c,
    to prepare the synproxy support for nf_tables, patches from
    Fernando Fernandez Mancera.

13) Support to restore expiration time in set element, from Laura Garcia.

14) Fix recent rewrite of netfilter IPv6 to avoid indirections
    when CONFIG_IPV6 is unset, from Arnd Bergmann.

15) Always reset vlan tag on skbuff fraglist when refragmenting in
    bridge conntrack, from wenxu.

16) Support to match IPv4 options in nf_tables, from Stephen Suryaputra.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 045df37e 1c5ba67d
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -1800,7 +1800,7 @@ S: 2300 Copenhagen S.
S: Denmark
S: Denmark


N: Jozsef Kadlecsik
N: Jozsef Kadlecsik
E: kadlec@blackhole.kfki.hu
E: kadlec@netfilter.org
P: 1024D/470DB964 4CB3 1A05 713E 9BF7 FAC5  5809 DD8C B7B1 470D B964
P: 1024D/470DB964 4CB3 1A05 713E 9BF7 FAC5  5809 DD8C B7B1 470D B964
D: netfilter: TCP window tracking code
D: netfilter: TCP window tracking code
D: netfilter: raw table
D: netfilter: raw table
+1 −1
Original line number Original line Diff line number Diff line
@@ -10866,7 +10866,7 @@ F: drivers/net/ethernet/neterion/


NETFILTER
NETFILTER
M:	Pablo Neira Ayuso <pablo@netfilter.org>
M:	Pablo Neira Ayuso <pablo@netfilter.org>
M:	Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
M:	Jozsef Kadlecsik <kadlec@netfilter.org>
M:	Florian Westphal <fw@strlen.de>
M:	Florian Westphal <fw@strlen.de>
L:	netfilter-devel@vger.kernel.org
L:	netfilter-devel@vger.kernel.org
L:	coreteam@netfilter.org
L:	coreteam@netfilter.org
+1 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@
 * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
 * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
 * the public domain.  It has no warranty.
 * the public domain.  It has no warranty.
 *
 *
 * Copyright (C) 2009-2010 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
 * Copyright (C) 2009-2010 Jozsef Kadlecsik (kadlec@netfilter.org)
 *
 *
 * I've modified Bob's hash to be useful in the Linux kernel, and
 * I've modified Bob's hash to be useful in the Linux kernel, and
 * any bugs present are my fault.
 * any bugs present are my fault.
+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@
/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 *                         Patrick Schaaf <bof@bof.de>
 *                         Patrick Schaaf <bof@bof.de>
 *                         Martin Josefsson <gandalf@wlug.westbo.se>
 *                         Martin Josefsson <gandalf@wlug.westbo.se>
 * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
 */
 */
#ifndef _IP_SET_H
#ifndef _IP_SET_H
#define _IP_SET_H
#define _IP_SET_H
+1 −2
Original line number Original line Diff line number Diff line
@@ -2,8 +2,7 @@
#ifndef _IP_SET_COUNTER_H
#ifndef _IP_SET_COUNTER_H
#define _IP_SET_COUNTER_H
#define _IP_SET_COUNTER_H


/* Copyright (C) 2015 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
/* Copyright (C) 2015 Jozsef Kadlecsik <kadlec@netfilter.org> */
 */


#ifdef __KERNEL__
#ifdef __KERNEL__


Loading