Re: Linux 2.6.16-rc4

[Jean Delvare <khali@linux-fr.org>]

Hi Linus, all,

Fix the following warning introduced by commit
ee68cea2c26b7a8222f9020f54d22c6067011e8b when !CONFIG_XFRM:

net/ipv4/netfilter/ip_nat_standalone.c: In function `ip_nat_out':
net/ipv4/netfilter/ip_nat_standalone.c:229: warning: unused variable `ctinfo'
net/ipv4/netfilter/ip_nat_standalone.c:228: warning: unused variable `ct'

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: David S. Miller <davem@davemloft.net>
---
 net/ipv4/netfilter/ip_nat_standalone.c |    2 ++
 1 files changed, 2 insertions(+)

--- linux-2.6.16-rc4.orig/net/ipv4/netfilter/ip_nat_standalone.c	2006-02-18 16:47:22.000000000 +0100
+++ linux-2.6.16-rc4/net/ipv4/netfilter/ip_nat_standalone.c	2006-02-18 16:47:40.000000000 +0100
@@ -225,8 +225,10 @@
 	   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. */

-- 
Jean Delvare
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/