[PATCH] 2.6.16: [NETFILTER] Fix Kconfig menu level for x_tables

[PATCH] 2.6.16: [NETFILTER] Fix Kconfig menu level for x_tables

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 1580 bytes --]

Hi Dave, please apply this to the 2.6.16 tree and push it to Linus.

Thanks!

[NETFILTER] Fix Kconfig menu level for x_tables

The new x_tables related Kconfig options appear at the wrong menu level
without this patch.

Signed-off-by: Harald Welte <laforge@netfilter.org>

---
commit 2d3e1788278398e3d9f33409066f3232730336a6
tree d23977bfeafb91fdbc5e5400d516ef623cde5a1d
parent 0b2d6ca5297c6343d9ae4c2259f85046e487ed01
author Harald Welte <laforge@netfilter.org> Mon, 13 Feb 2006 12:04:25 +0100
committer Harald Welte <laforge@netfilter.org> Mon, 13 Feb 2006 12:04:25 +0100

 net/netfilter/Kconfig |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 99c0a0f..0e55012 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -102,8 +102,6 @@ config NF_CT_NETLINK
 	help
 	  This option enables support for a netlink-based userspace interface
 
-endmenu
-
 config NETFILTER_XTABLES
 	tristate "Netfilter Xtables support (required for ip_tables)"
 	help
@@ -361,3 +359,5 @@ config NETFILTER_XT_MATCH_TCPMSS
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
+endmenu
+
-- 
- Harald Welte <laforge@netfilter.org>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] 2.6.16: [NETFILTER] Fix Kconfig menu level for x_tables

[David S. Miller]

From: Harald Welte <laforge@netfilter.org>
Date: Mon, 13 Feb 2006 12:06:00 +0100

> [NETFILTER] Fix Kconfig menu level for x_tables
> 
> The new x_tables related Kconfig options appear at the wrong menu level
> without this patch.
> 
> Signed-off-by: Harald Welte <laforge@netfilter.org>

Applied, thanks Harald.