From: Oliver Smith <oliver@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> Earlier today I sent a patch that cleaned up the hash extension, not noticing that the bitmap family is in a similar state. This series cleans up the code for both the hash and bitmap families. Patch 1 is identical to the one I sent earlier today but has a different commit message that specifically mentions that it applies to the hash family. Oliver Smith (2): netfilter: ipset: rework hash ext. handling to be more manageable. netfilter: ipset: rework bitmap ext. handling to be more manageable. kernel/include/uapi/linux/netfilter/ipset/ip_set.h | 8 +- kernel/net/netfilter/ipset/ip_set_bitmap_gen.h | 55 ++++++++++ kernel/net/netfilter/ipset/ip_set_bitmap_ip.c | 68 ++---------- kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c | 63 ++--------- kernel/net/netfilter/ipset/ip_set_bitmap_port.c | 57 +--------- kernel/net/netfilter/ipset/ip_set_hash_gen.h | 121 ++++++++------------- 6 files changed, 129 insertions(+), 243 deletions(-) -- 1.8.3.2 -- 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