Commit 667ec21e authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

Merge branch 'master' of git://blackhole.kfki.hu/nf-next 



Jozsef Kadlecsik says:

====================
ipset patches for nf-next

- Remove useless memset() calls, nla_parse_nested/nla_parse
  erase the tb array properly, from Florent Fourcot.
- Merge the uadd and udel functions, the code is nicer
  this way, also from Florent Fourcot.
- Add a missing check for the return value of a
  nla_parse[_deprecated] call, from Aditya Pakki.
- Add the last missing check for the return value
  of nla_parse[_deprecated] call.
- Fix error path and release the references properly
  in set_target_v3_checkentry().
- Fix memory accounting which is reported to userspace
  for hash types on resize, from Stefano Brivio.
- Update my email address to kadlec@netfilter.org.
  The patch covers all places in the source tree where
  my kadlec@blackhole.kfki.hu address could be found.
====================

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parents 22567590 fe03d474

CREDITS

+1 −1
Original line number Diff line number Diff line
@@ -1800,7 +1800,7 @@ S: 2300 Copenhagen S. 
S: Denmark



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

D: netfilter: TCP window tracking code

D: netfilter: raw table

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10858,7 +10858,7 @@ F: drivers/net/ethernet/neterion/ 


NETFILTER

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>

L:	netfilter-devel@vger.kernel.org

L:	coreteam@netfilter.org

include/linux/jhash.h

+1 −1
Original line number 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

 * 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

 * any bugs present are my fault.

include/linux/netfilter/ipset/ip_set.h

+1 −1
Original line number Diff line number Diff line 
/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>

 *                         Patrick Schaaf <bof@bof.de>

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

 *

 * 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

include/linux/netfilter/ipset/ip_set_counter.h

+1 −1
Original line number Diff line number Diff line 
#ifndef _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>

 *

 * 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

CRA Git | Maintained and supported by SUSTech CRA and CCSE