Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ab4f58c77a189d1100383e0c901cb8e90c3ab4f7
Commit:     ab4f58c77a189d1100383e0c901cb8e90c3ab4f7
Parent:     4ad9d4fa94800573edaca18ba2f34f27137c9bc0
Author:     Patrick McHardy <[EMAIL PROTECTED]>
AuthorDate: Wed Dec 5 01:31:37 2007 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 14:56:24 2008 -0800

    [NETFILTER]: remove NF_CONNTRACK_ENABLED option
    
    Remove the NF_CONNTRACK_ENABLED option. It was meant for a smoother upgrade
    to nf_conntrack, people having reconfigured their kernel at least once since
    ip_conntrack was removed will have the NF_CONNTRACK option already set.
    People upgrading from older kernels have to reconfigure a lot anyway.
    
    Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/netfilter/Kconfig |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 4182393..772c58c 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -25,8 +25,7 @@ config NETFILTER_NETLINK_LOG
          and is also scheduled to replace the old syslog-based ipt_LOG
          and ip6t_LOG modules.
 
-# Rename this to NF_CONNTRACK in a 2.6.25
-config NF_CONNTRACK_ENABLED
+config NF_CONNTRACK
        tristate "Netfilter connection tracking support"
        help
          Connection tracking keeps a record of what packets have passed
@@ -40,10 +39,6 @@ config NF_CONNTRACK_ENABLED
 
          To compile it as a module, choose M here.  If unsure, say N.
 
-config NF_CONNTRACK
-       tristate
-       default NF_CONNTRACK_ENABLED
-
 config NF_CT_ACCT
        bool "Connection tracking flow accounting"
        depends on NF_CONNTRACK
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to