Hi Pablo, Here follows the ipset patches against nf-next-2.6. My last batch could not be applied due to old patches missing from the tree. Best regards, Jozsef Jozsef Kadlecsik (15): netfilter: ipset: Timeout can be modified for already added elements netfilter: ipset: Whitespace fixes: some space before tab slipped in. netfilter: ipset: Options and flags support added to the kernel API netfilter: ipset: Support listing setnames and headers too netfilter: ipset: Fix adding ranges to hash types netfilter: ipset: Set type support with multiple revisions added netfilter: ipset: Support range for IPv4 at adding/deleting elements for hash:*net* types netfilter: ipset: Adding ranges to hash types with timeout could still fail, fixed netfilter: ipset: Take into account cidr value for the from address when creating the set netfilter: ipset: Use unified from/to address masking and check the usage netfilter: ipset: Add xt_action_param to the variant level kadt functions, ipset API change netfilter: ipset: Fix return code for destroy when sets are in use netfilter: ipset: Use the stored first cidr value instead of '1' netfilter: ipset: hash:net,iface type introduced netfilter: ipset: Whitespace and coding fixes detected by checkpatch.pl include/linux/netfilter/ipset/ip_set.h | 50 ++- include/linux/netfilter/ipset/ip_set_ahash.h | 48 ++- include/linux/netfilter/ipset/ip_set_hash.h | 4 + include/linux/netfilter/ipset/ip_set_timeout.h | 5 +- include/linux/netfilter/ipset/pfxlen.h | 11 +- include/linux/netfilter/xt_set.h | 15 +- net/netfilter/ipset/Kconfig | 10 + net/netfilter/ipset/Makefile | 1 + net/netfilter/ipset/ip_set_bitmap_ip.c | 35 +- net/netfilter/ipset/ip_set_bitmap_ipmac.c | 38 +- net/netfilter/ipset/ip_set_bitmap_port.c | 31 +- net/netfilter/ipset/ip_set_core.c | 165 +++--- net/netfilter/ipset/ip_set_hash_ip.c | 43 +- net/netfilter/ipset/ip_set_hash_ipport.c | 63 ++- net/netfilter/ipset/ip_set_hash_ipportip.c | 67 ++- net/netfilter/ipset/ip_set_hash_ipportnet.c | 141 +++-- net/netfilter/ipset/ip_set_hash_net.c | 90 +++- net/netfilter/ipset/ip_set_hash_netiface.c | 762 ++++++++++++++++++++++++ net/netfilter/ipset/ip_set_hash_netport.c | 119 +++-- net/netfilter/ipset/ip_set_list_set.c | 106 +++-- net/netfilter/ipset/pfxlen.c | 23 +- net/netfilter/xt_set.c | 152 ++++-- 22 files changed, 1589 insertions(+), 390 deletions(-) create mode 100644 net/netfilter/ipset/ip_set_hash_netiface.c -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html