[netfilter-cvslog] r3751 - in trunk/patch-o-matic-ng/talk-conntrack-nat/linux-2.6.11: . net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-03-02 12:57:15 +0100 (Wed, 02 Mar 2005)
New Revision: 3751

Removed:
   trunk/patch-o-matic-ng/talk-conntrack-nat/linux-2.6.11/Documentation/
   trunk/patch-o-matic-ng/talk-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/Config.in.ladd
   trunk/patch-o-matic-ng/talk-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/Config.in.ladd_2
Log:
remove 2.4isms from 2.6.11 tree


Deleted: trunk/patch-o-matic-ng/talk-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/Config.in.ladd
===================================================================
--- trunk/patch-o-matic-ng/talk-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/Config.in.ladd	2005-03-02 11:55:49 UTC (rev 3750)
+++ trunk/patch-o-matic-ng/talk-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/Config.in.ladd	2005-03-02 11:57:15 UTC (rev 3751)
@@ -1,2 +0,0 @@
-  dep_tristate '  FTP protocol support' CONFIG_IP_NF_FTP $CONFIG_IP_NF_CONNTRACK
-  dep_tristate '  talk protocol support' CONFIG_IP_NF_TALK $CONFIG_IP_NF_CONNTRACK

Deleted: trunk/patch-o-matic-ng/talk-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/Config.in.ladd_2
===================================================================
--- trunk/patch-o-matic-ng/talk-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/Config.in.ladd_2	2005-03-02 11:55:49 UTC (rev 3750)
+++ trunk/patch-o-matic-ng/talk-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/Config.in.ladd_2	2005-03-02 11:57:15 UTC (rev 3751)
@@ -1,10 +0,0 @@
-      dep_tristate '    REDIRECT target support' CONFIG_IP_NF_TARGET_REDIRECT $CONFIG_IP_NF_NAT
-      # If they want talk, set to $CONFIG_IP_NF_NAT (m or y), 
-      # or $CONFIG_IP_NF_TALK (m or y), whichever is weaker.  Argh.
-      if [ "$CONFIG_IP_NF_TALK" = "m" ]; then
-	define_tristate CONFIG_IP_NF_NAT_TALK m
-      else
-        if [ "$CONFIG_IP_NF_TALK" = "y" ]; then
-          define_tristate CONFIG_IP_NF_NAT_TALK $CONFIG_IP_NF_NAT
-        fi
-      fi