* [KJ] [PATCH] net/ipv4/netfilter/ip_nat_standalone.c 2.6.17-rc2-git5
@ 2006-04-24 21:29 Anne Thrax
0 siblings, 0 replies; only message in thread
From: Anne Thrax @ 2006-04-24 21:29 UTC (permalink / raw)
To: kernel-janitors
Don't declare some variables if CONFIG_XFRM isn't defined. If
CONFIG_XFRM isn't defined, they arent' used.
---
/usr/src/linux-2.6.17-rc2-git5-orig/net/ipv4/netfilter/ip_nat_standalone.c
2006-04-23 16:47:53.000000000 -0500
+++
/usr/src/linux-2.6.17-rc2-git5/net/ipv4/netfilter/ip_nat_standalone.c
2006-04-24 16:24:56.000000000 -0500
@@ -219,8 +219,6 @@
const struct net_device *out,
int (*okfn)(struct sk_buff *))
{
- struct ip_conntrack *ct;
- enum ip_conntrack_info ctinfo;
unsigned int ret;
/* root is playing with raw sockets. */
@@ -230,6 +228,10 @@
ret = ip_nat_fn(hooknum, pskb, in, out, okfn);
#ifdef CONFIG_XFRM
+
+ struct ip_conntrack *ct;
+ enum ip_conntrack_info ctinfo;
+
if (ret != NF_DROP && ret != NF_STOLEN
&& (ct = ip_conntrack_get(*pskb, &ctinfo)) != NULL) {
enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2006-04-24 21:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-24 21:29 [KJ] [PATCH] net/ipv4/netfilter/ip_nat_standalone.c 2.6.17-rc2-git5 Anne Thrax
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.