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

[Maximilian Attems]

Author: maks
Date: Thu May 24 07:30:44 2012
New Revision: 19030

Log:
topconfig enable new (> 3.2) iptables options

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	Tue May 22 02:59:56 2012	(r19029)
+++ dists/trunk/linux-2.6/debian/changelog	Thu May 24 07:30:44 2012	(r19030)
@@ -2,7 +2,9 @@
 
   * New upstream release: http://kernelnewbies.org/Linux_3.4
 
-  * Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT.
+  * Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT,
+    IP_NF_MATCH_RPFILTER, IP6_NF_MATCH_RPFILTER, NETFILTER_NETLINK_ACCT,
+    NETFILTER_XT_MATCH_NFACCT.
 
  -- 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	Tue May 22 02:59:56 2012	(r19029)
+++ dists/trunk/linux-2.6/debian/config/config	Thu May 24 07:30:44 2012	(r19030)
@@ -4271,6 +4271,7 @@
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
@@ -4328,6 +4329,7 @@
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_FILTER=m
@@ -4368,6 +4370,7 @@
 ##
 ## file: net/netfilter/Kconfig
 ##
+CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK=m
@@ -4415,6 +4418,7 @@
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m