This patch series does some initial preparation work with the
(eventual) goal to remove nf_conntrack_ipv{4,6} and replace it
with a builtin inet tracker than handles both protocols.The first two patches move nf_ip_checksum handling out of ipv4/ip6. This is to get rid of the (unneeded) dependency of nf_conntrack_ipv6 on ipv6. The remaining patches get rid of the l3proto indirections, except the add/delete of the actual hooks from config plane. include/linux/netfilter_ipv4.h | 11 - include/linux/netfilter_ipv6.h | 5 include/net/netfilter/nf_conntrack_core.h | 14 - include/net/netfilter/nf_conntrack_l3proto.h | 30 --- net/ipv4/netfilter.c | 53 ------- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 104 ------------- net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 3 net/ipv6/netfilter.c | 62 -------- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 105 ------------- net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 3 net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 1 net/netfilter/Makefile | 2 net/netfilter/nf_conntrack_core.c | 173 ++++++++++++++++++----- net/netfilter/nf_conntrack_expect.c | 1 net/netfilter/nf_conntrack_helper.c | 1 net/netfilter/nf_conntrack_netlink.c | 96 +++++++++--- net/netfilter/nf_conntrack_proto.c | 10 - net/netfilter/nf_conntrack_standalone.c | 14 - net/netfilter/nfnetlink_cttimeout.c | 1 net/netfilter/utils.c | 131 +++++++++++++++-- net/openvswitch/conntrack.c | 17 -- net/netfilter/nf_conntrack_l3proto_generic.c | 66 -------- 22 files changed, 347 insertions(+), 556 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
