From: Changli Gao <xiaosuo@gmail.com>
Date: Mon, 15 Nov 2010 11:27:27 +0000 (+0100)
Subject: netfilter: nf_nat: define nat_pptp_info as needed
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~18618^2~510^2~34
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=03c0e5bb34c9755ae4d955c97fba40b24e9c7fe7;p=mirror_ubuntu-artful-kernel.git

netfilter: nf_nat: define nat_pptp_info as needed

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---

diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h
index e966092a36f1..aff80b190c12 100644
--- a/include/net/netfilter/nf_nat.h
+++ b/include/net/netfilter/nf_nat.h
@@ -56,7 +56,9 @@ struct nf_nat_multi_range_compat {
 /* per conntrack: nat application helper private data */
 union nf_conntrack_nat_help {
 	/* insert nat helper private data here */
+#if defined(CONFIG_NF_NAT_PPTP) || defined(CONFIG_NF_NAT_PPTP_MODULE)
 	struct nf_nat_pptp nat_pptp_info;
+#endif
 };
 
 struct nf_conn;