From: Oliver Smith <oliver@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> This is a do-over of my previous patch to be compatible with the new changes to the ipset codebase. Currently the changes to ip_set_hash_gen.h are part of the kernel-code commit, if you'd prefer that to be split out into its own commit as a preparatory operation, let me know. Signed-off-by: Oliver Smith <oliver@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> Oliver Smith (2): netfilter: ipset: Add hash:net,net module to kernel. ipset: Add userspace code to support hash:net,net kernel module. kernel/net/netfilter/ipset/Kbuild | 1 + kernel/net/netfilter/ipset/Kconfig | 9 + kernel/net/netfilter/ipset/ip_set_hash_gen.h | 56 +++ kernel/net/netfilter/ipset/ip_set_hash_netnet.c | 473 ++++++++++++++++++++++++ lib/Makefile.am | 1 + lib/ipset_hash_netnet.c | 158 ++++++++ src/ipset.8 | 74 ++++ tests/hash:net,net.t | 169 +++++++++ tests/hash:net,net.t.list0 | 10 + tests/hash:net,net.t.list1 | 6 + tests/hash:net,net.t.list2 | 22 ++ tests/hash:net6,net6.t | 151 ++++++++ tests/hash:net6,net6.t.list0 | 10 + tests/hash:net6,net6.t.list1 | 6 + tests/netnetgen.sh | 9 + tests/resizen.sh | 13 + tests/resizet.sh | 8 + tests/runtest.sh | 2 +- 18 files changed, 1177 insertions(+), 1 deletion(-) create mode 100644 kernel/net/netfilter/ipset/ip_set_hash_netnet.c create mode 100644 lib/ipset_hash_netnet.c create mode 100644 tests/hash:net,net.t create mode 100644 tests/hash:net,net.t.list0 create mode 100644 tests/hash:net,net.t.list1 create mode 100644 tests/hash:net,net.t.list2 create mode 100644 tests/hash:net6,net6.t create mode 100644 tests/hash:net6,net6.t.list0 create mode 100644 tests/hash:net6,net6.t.list1 create mode 100755 tests/netnetgen.sh -- 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
