diff options
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 8 | ||||
-rw-r--r-- | net/ipv4/netfilter/Kconfig | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 484250dcdbe0..062fc2e79c86 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -311,3 +311,11 @@ Who: Tejun Heo <htejun@gmail.com> | |||
311 | 311 | ||
312 | --------------------------- | 312 | --------------------------- |
313 | 313 | ||
314 | What: iptables SAME target | ||
315 | When: 1.1. 2008 | ||
316 | Files: net/ipv4/netfilter/ipt_SAME.c, include/linux/netfilter_ipv4/ipt_SAME.h | ||
317 | Why: Obsolete for multiple years now, NAT core provides the same behaviour. | ||
318 | Unfixable broken wrt. 32/64 bit cleanness. | ||
319 | Who: Patrick McHardy <kaber@trash.net> | ||
320 | |||
321 | --------------------------- | ||
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index 46509fae9fd8..fa97947c6ae1 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig | |||
@@ -230,7 +230,7 @@ config IP_NF_TARGET_NETMAP | |||
230 | To compile it as a module, choose M here. If unsure, say N. | 230 | To compile it as a module, choose M here. If unsure, say N. |
231 | 231 | ||
232 | config IP_NF_TARGET_SAME | 232 | config IP_NF_TARGET_SAME |
233 | tristate "SAME target support" | 233 | tristate "SAME target support (OBSOLETE)" |
234 | depends on NF_NAT | 234 | depends on NF_NAT |
235 | help | 235 | help |
236 | This option adds a `SAME' target, which works like the standard SNAT | 236 | This option adds a `SAME' target, which works like the standard SNAT |