[NETFILTER]: ipt_SAME: add to feature-removal-schedule

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 484250d..062fc2e 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -311,3 +311,11 @@ Who:  Tejun Heo <htejun@gmail.com>
 
 ---------------------------
 
+What:  iptables SAME target
+When:  1.1. 2008
+Files: net/ipv4/netfilter/ipt_SAME.c, include/linux/netfilter_ipv4/ipt_SAME.h
+Why:   Obsolete for multiple years now, NAT core provides the same behaviour.
+       Unfixable broken wrt. 32/64 bit cleanness.
+Who:   Patrick McHardy <kaber@trash.net>
+
+---------------------------

diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 46509fa..fa97947 100644 (file)
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -230,7 +230,7 @@ config IP_NF_TARGET_NETMAP
          To compile it as a module, choose M here.  If unsure, say N.
 
 config IP_NF_TARGET_SAME
-       tristate "SAME target support"
+       tristate "SAME target support (OBSOLETE)"
        depends on NF_NAT
        help
          This option adds a `SAME' target, which works like the standard SNAT