From: Anne Thrax <foobarfoobarfoobar@gmail.com>
To: kernel-janitors@vger.kernel.org
Subject: [KJ] [PATCH] net/ipv4/netfilter/ip_nat_standalone.c 2.6.17-rc2-git5
Date: Mon, 24 Apr 2006 21:29:31 +0000 [thread overview]
Message-ID: <444D433B.5010505@gmail.com> (raw)
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
reply other threads:[~2006-04-24 21:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=444D433B.5010505@gmail.com \
--to=foobarfoobarfoobar@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.