[kernel] r19027 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Mon May 21 14:50:09 2012
New Revision: 19027

Log:
Enable NF_CONNTRACK_TIMEOUT and NF_CT_NETLINK_TIMEOUT.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon May 21 14:50:06 2012	(r19026)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 21 14:50:09 2012	(r19027)
@@ -2,7 +2,7 @@
 
   * New upstream release: http://kernelnewbies.org/Linux_3.4
 
-  * Enable DM_VERITY.
+  * Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 21 May 2012 01:37:21 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon May 21 14:50:06 2012	(r19026)
+++ dists/trunk/linux-2.6/debian/config/config	Mon May 21 14:50:09 2012	(r19027)
@@ -4266,6 +4266,7 @@
 ##
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
@@ -4391,6 +4392,7 @@
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=y
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_SET=m