From patchwork Sun Nov 14 11:47:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 71096 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 70FDFB7121 for ; Sun, 14 Nov 2010 22:48:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755290Ab0KNLsM (ORCPT ); Sun, 14 Nov 2010 06:48:12 -0500 Received: from mail-iw0-f174.google.com ([209.85.214.174]:60588 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755207Ab0KNLsL (ORCPT ); Sun, 14 Nov 2010 06:48:11 -0500 Received: by iwn10 with SMTP id 10so5489460iwn.19 for ; Sun, 14 Nov 2010 03:48:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=EspdvsC1gns2neo8oZrMT72qhRkPMSu6pGEpy1XW7kU=; b=nZyGj2vvr0wsGSEo/9fP5GvcA8uqNL98L2XwPnKX2zcwzik+mdT8YwyyLq6oLZpga6 YFVSPBfVp9i3o9mCKeQoJv36Jjg5Eh0WHiv8qze0e4NM5ujI6yQRtWADLX/GlU0yrzwI WU8y3WkdLpZtmkmg6kWyhtParWHADwWhAAuPA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=mfeHqnQZX72pvJ/tgTb4Auso9s8RVN9jPJfEl1H3i+bGpZgGfZ7JSJCV+oYRojkf7f 07cRhJ212P7s+dk7HymsbLjurUOUQt3vwDwDQTKIDbgXqmiC3Zfsw4gXfW8RTZZtSeP+ uX/Noc5xtNTzhRxn0bU3fSa/QWPsHUE8ZKwaQ= Received: by 10.42.239.195 with SMTP id kx3mr4176661icb.396.1289735291265; Sun, 14 Nov 2010 03:48:11 -0800 (PST) Received: from localhost.localdomain ([221.239.34.230]) by mx.google.com with ESMTPS id d21sm6169193ibg.9.2010.11.14.03.48.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 14 Nov 2010 03:48:10 -0800 (PST) From: Changli Gao To: Patrick McHardy Cc: "David S. Miller" , netfilter-devel@vger.kernel.org, netdev@vger.kernel.org, Changli Gao Subject: [PATCH] netfilter: define nat_pptp_info as needed Date: Sun, 14 Nov 2010 19:47:48 +0800 Message-Id: <1289735268-13791-1-git-send-email-xiaosuo@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Changli Gao --- include/net/netfilter/nf_nat.h | 2 ++ 1 file changed, 2 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h index f5f09f0..d082938 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;