---

yaml --- r: 26476 b: refs/heads/master c: 2354fea h: refs/heads/master v: v3
git-mirror · May 4, 2006 · df383a8 · df383a8
1 parent 217890f
commit df383a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4228e2a9890cd01b0c8cc58af6fd9e08a4b5e8a7
+refs/heads/master: 2354feaeb2acb78f6aabdf8410d55b44492a7949
diff --git a/trunk/net/ipv4/netfilter/ip_nat_standalone.c b/trunk/net/ipv4/netfilter/ip_nat_standalone.c
@@ -219,8 +219,10 @@ ip_nat_out(unsigned int hooknum,
 	   const struct net_device *out,
 	   int (*okfn)(struct sk_buff *))
 {
+#ifdef CONFIG_XFRM
 	struct ip_conntrack *ct;
 	enum ip_conntrack_info ctinfo;
+#endif
 	unsigned int ret;
 
 	/* root is playing with raw sockets. */