Merge branch 'master' of git://1984.lsi.us.es/nf-next
Pablo Neira Ayuso says:
====================
This patchset contains updates for your net-next tree, they are:
* Mostly fixes for the recently pushed IPv6 NAT support:
- Fix crash while removing nf_nat modules from Patrick McHardy.
- Fix unbalanced rcu_read_unlock from Ulrich Weber.
- Merge NETMAP and REDIRECT into one single xt_target module, from
Jan Engelhardt.
- Fix Kconfig for IPv6 NAT, which allows inconsistent configurations,
from myself.
* Updates for ipset, all of the from Jozsef Kadlecsik:
- Add the new "nomatch" option to obtain reverse set matching.
- Support for /0 CIDR in hash:net,iface set type.
- One non-critical fix for a rare crash due to pass really
wrong configuration parameters.
- Coding style cleanups.
- Sparse fixes.
- Add set revision supported via modinfo.i
* One extension for the xt_time match, to support matching during
the transition between two days with one single rule, from
Florian Westphal.
* Fix maximum packet length supported by nfnetlink_queue and add
NFQA_CAP_LEN attribute, from myself.
You can notice that this batch contains a couple of fixes that may
go to 3.6-rc but I don't consider them critical to push them:
* The ipset fix for the /0 cidr case, which is triggered with one
inconsistent command line invocation of ipset.
* The nfnetlink_queue maximum packet length supported since it requires
the new NFQA_CAP_LEN attribute to provide a full workaround for the
described problem.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- include/linux/netfilter/ipset/ip_set.h 13 additions, 2 deletionsinclude/linux/netfilter/ipset/ip_set.h
- include/linux/netfilter/ipset/ip_set_ahash.h 56 additions, 50 deletionsinclude/linux/netfilter/ipset/ip_set_ahash.h
- include/linux/netfilter/nf_conntrack_ftp.h 5 additions, 1 deletioninclude/linux/netfilter/nf_conntrack_ftp.h
- include/linux/netfilter/nfnetlink_queue.h 1 addition, 0 deletionsinclude/linux/netfilter/nfnetlink_queue.h
- include/linux/netfilter/xt_time.h 5 additions, 0 deletionsinclude/linux/netfilter/xt_time.h
- net/ipv4/netfilter/Kconfig 10 additions, 13 deletionsnet/ipv4/netfilter/Kconfig
- net/ipv4/netfilter/Makefile 0 additions, 2 deletionsnet/ipv4/netfilter/Makefile
- net/ipv6/netfilter/Kconfig 36 additions, 55 deletionsnet/ipv6/netfilter/Kconfig
- net/ipv6/netfilter/Makefile 0 additions, 2 deletionsnet/ipv6/netfilter/Makefile
- net/ipv6/netfilter/ip6t_NETMAP.c 0 additions, 94 deletionsnet/ipv6/netfilter/ip6t_NETMAP.c
- net/ipv6/netfilter/ip6t_REDIRECT.c 0 additions, 98 deletionsnet/ipv6/netfilter/ip6t_REDIRECT.c
- net/netfilter/Kconfig 21 additions, 0 deletionsnet/netfilter/Kconfig
- net/netfilter/Makefile 2 additions, 0 deletionsnet/netfilter/Makefile
- net/netfilter/ipset/ip_set_bitmap_ip.c 12 additions, 7 deletionsnet/netfilter/ipset/ip_set_bitmap_ip.c
- net/netfilter/ipset/ip_set_bitmap_ipmac.c 11 additions, 7 deletionsnet/netfilter/ipset/ip_set_bitmap_ipmac.c
- net/netfilter/ipset/ip_set_bitmap_port.c 6 additions, 3 deletionsnet/netfilter/ipset/ip_set_bitmap_port.c
- net/netfilter/ipset/ip_set_core.c 12 additions, 3 deletionsnet/netfilter/ipset/ip_set_core.c
- net/netfilter/ipset/ip_set_hash_ip.c 9 additions, 6 deletionsnet/netfilter/ipset/ip_set_hash_ip.c
- net/netfilter/ipset/ip_set_hash_ipport.c 14 additions, 10 deletionsnet/netfilter/ipset/ip_set_hash_ipport.c
- net/netfilter/ipset/ip_set_hash_ipportip.c 14 additions, 10 deletionsnet/netfilter/ipset/ip_set_hash_ipportip.c
Loading
Please register or sign in to comment