The first patch is a small documentation fix. The second patch adds more flexibility to configure the conntrack gc. I target it specifically to net and not net-next because the removal of the conntrack timer has just land into net. Documentation/networking/nf_conntrack-sysctl.txt | 35 +++++++++++------------ include/net/netfilter/nf_conntrack_core.h | 5 ++++ net/netfilter/nf_conntrack_core.c | 17 +++++------ net/netfilter/nf_conntrack_standalone.c | 36 ++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 26 deletions(-) Comments are welcomed, Regards, Nicolas -- 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
