This patch gets rid of the struct nf_afinfo abstraction. This adds an innecessary indirection for IPv4 since it can be replaced by direct calls. And the IPv6 specific functions can be store in struct nf_ipv6_ops which is there to avoid IPv6 module autoload due to explicit symbol dependencies. Previous patchset version was flawed with CONFIG_IPV6=m. Pablo Neira Ayuso (7): netfilter: move checksum indirection to struct nf_ipv6_ops netfilter: move checksum_partial indirection to struct nf_ipv6_ops netfilter: remove saveroute indirection in struct nf_afinfo netfilter: move route indirection to struct nf_ipv6_ops netfilter: move reroute indirection to struct nf_ipv6_ops netfilter: remove route_key_size field in struct nf_afinfo netfilter: core: remove struct nf_afinfo and its helper functions include/linux/netfilter.h | 68 ++++--------------------- include/linux/netfilter_ipv4.h | 16 ++++++ include/linux/netfilter_ipv6.h | 17 +++++++ net/bridge/netfilter/nf_tables_bridge.c | 51 ++----------------- net/ipv4/netfilter.c | 62 ++++------------------- net/ipv6/netfilter.c | 44 +++------------- net/ipv6/netfilter/nft_fib_ipv6.c | 12 ++--- net/netfilter/Makefile | 2 +- net/netfilter/core.c | 22 -------- net/netfilter/nf_conntrack_h323_main.c | 30 +++++------ net/netfilter/nf_queue.c | 68 +++++++++++++++++++++---- net/netfilter/nft_rt.c | 15 ++---- net/netfilter/utils.c | 90 +++++++++++++++++++++++++++++++++ net/netfilter/xt_TCPMSS.c | 5 +- net/netfilter/xt_addrtype.c | 15 +++--- 15 files changed, 245 insertions(+), 272 deletions(-) create mode 100644 net/netfilter/utils.c -- 2.11.0 -- 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
