From f5f2990a80235b38ce139ded685683601c5648dd Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Mon, 18 Jan 2010 08:08:37 +0100
Subject: [PATCH] --- yaml --- r: 184135 b: refs/heads/master c:
 e9d3897cc2205eec8b7afcc022e4730914b4f48c h: refs/heads/master i:   184133:
 93832a4c2040cd9bf2a896d2fee791eb46b63f15   184131:
 0d2ce7c790c90df13568e0ecc4441530e95df783   184127:
 974dab17e06397e634bc0c6075a5e2466e53ebb2 v: v3

---
 [refs]                         | 2 +-
 trunk/include/net/netns/ipv4.h | 2 ++
 trunk/include/net/netns/ipv6.h | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index be7ba153cf9e..bef9f108ebcd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83fc81024bd8572f31db784f8c0079e999a4fa44
+refs/heads/master: e9d3897cc2205eec8b7afcc022e4730914b4f48c
diff --git a/trunk/include/net/netns/ipv4.h b/trunk/include/net/netns/ipv4.h
index 2eb3814d6258..8098f6b8319d 100644
--- a/trunk/include/net/netns/ipv4.h
+++ b/trunk/include/net/netns/ipv4.h
@@ -37,7 +37,9 @@ struct netns_ipv4 {
 	struct xt_table		*iptable_mangle;
 	struct xt_table		*iptable_raw;
 	struct xt_table		*arptable_filter;
+#ifdef CONFIG_SECURITY
 	struct xt_table		*iptable_security;
+#endif
 	struct xt_table		*nat_table;
 	struct hlist_head	*nat_bysource;
 	int			nat_vmalloced;
diff --git a/trunk/include/net/netns/ipv6.h b/trunk/include/net/netns/ipv6.h
index dfeb2d7c425b..1f11ebc22151 100644
--- a/trunk/include/net/netns/ipv6.h
+++ b/trunk/include/net/netns/ipv6.h
@@ -36,7 +36,9 @@ struct netns_ipv6 {
 	struct xt_table		*ip6table_filter;
 	struct xt_table		*ip6table_mangle;
 	struct xt_table		*ip6table_raw;
+#ifdef CONFIG_SECURITY
 	struct xt_table		*ip6table_security;
+#endif
 #endif
 	struct rt6_info         *ip6_null_entry;
 	struct rt6_statistics   *rt6_stats;