This patch series merges nf_conntrack_ipv{4,6} into nf_conntrack
module.
The l3proto abstractions and the indirect calls used to glue the l3 tracker to
the conntrack core are removed.
As nf_conntrack_ipv6 no longer depends on the ipv6 module this
is feasible, reducing complexity and code size.
The patches first get rid of the l3proto indirections by merging
them into the core, then remove the l3 trackers themselves.
After this is becomes possible to simplify the l4proto
protocol handling as well.
Florian Westphal (8):
netfilter: conntrack: remove ctnetlink callbacks from l3 protocol trackers
netfilter: conntrack: remove pkt_to_tuple indirection from l3 protocol trackers
netfilter: conntrack: remove invert_tuple indirection from l3 protocol trackers
netfilter: conntrack: remove get_l4proto indirection from l3 protocol trackers
netfilter: conntrack: avoid calls to l4proto invert_tuple
netfilter: conntrack: avoid l4proto pkt_to_tuple calls
netfilter: conntrack: remove get_timeout() indirection
netfilter: conntrack: remove l3proto abstraction
include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 3
include/net/netfilter/nf_conntrack.h | 5
include/net/netfilter/nf_conntrack_core.h | 8
include/net/netfilter/nf_conntrack_l4proto.h | 14
include/net/netfilter/nf_conntrack_timeout.h | 18
net/ipv4/netfilter/Kconfig | 22
net/ipv4/netfilter/Makefile | 6
net/ipv6/netfilter/Kconfig | 20
net/ipv6/netfilter/Makefile | 6
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 1
net/netfilter/Kconfig | 2
net/netfilter/Makefile | 7
net/netfilter/nf_conntrack_core.c | 212 ++++-
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 | 843 ++++++++++++++++-------
net/netfilter/nf_conntrack_proto_dccp.c | 44 -
net/netfilter/nf_conntrack_proto_generic.c | 32
net/netfilter/nf_conntrack_proto_gre.c | 24
net/netfilter/nf_conntrack_proto_icmp.c | 19
net/netfilter/nf_conntrack_proto_icmpv6.c | 17
net/netfilter/nf_conntrack_proto_sctp.c | 46 -
net/netfilter/nf_conntrack_proto_tcp.c | 52 -
net/netfilter/nf_conntrack_proto_udp.c | 55 -
net/netfilter/nf_conntrack_standalone.c | 28
net/netfilter/nf_nat_core.c | 8
net/netfilter/nfnetlink_cttimeout.c | 13
include/net/netfilter/nf_conntrack_l3proto.h | 84 --
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 472 ------------
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 460 ------------
net/netfilter/nf_conntrack_l3proto_generic.c | 66 -
32 files changed, 967 insertions(+), 1718 deletions(-)
--
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
