From patchwork Fri Jun 21 23:17:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Gross X-Patchwork-Id: 253322 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 504EC2C03FE for ; Sat, 22 Jun 2013 09:17:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946247Ab3FUXRX (ORCPT ); Fri, 21 Jun 2013 19:17:23 -0400 Received: from na3sys009aog106.obsmtp.com ([74.125.149.77]:52494 "HELO na3sys009aog106.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1946207Ab3FUXRV (ORCPT ); Fri, 21 Jun 2013 19:17:21 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]) (using TLSv1) by na3sys009aob106.postini.com ([74.125.148.12]) with SMTP ID DSNKUcTfAEGC7ZZRRU8GiNTPFWO7QypcpmBv@postini.com; Fri, 21 Jun 2013 16:17:21 PDT Received: by mail-pa0-f54.google.com with SMTP id kx10so8444790pab.41 for ; Fri, 21 Jun 2013 16:17:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=FckPkJBsExwx+ytIyVsgL1i8NG8X0TL7Ov/TvdQ6wQU=; b=Ay8L9IfXF+eBQZUtqQyeoa9pmmhe8ozAqTqQtUvikUTYWCv6eaEi2RCG70noKFEshA jb3WFvUmmMsslhslU1hPfRl8YxNKattEW4SuPwjw4nqgt5H5ICSgS7Eg7uM+7IIvxTZV 6EH/2apqCU57drhw2dhw5KOg10QJMHl6vzjuLiBgNpAJlsezDOySfxlawxffaK5+jtO1 +Z35HpdN/RtrzELpeiL5E8MBqs8gQAZyEUSuhadShFPyENnKqg+gxVlFpPvoBx1LkrAC LWBs+9NjZzslfUXQynbqs5OJgfYC4dFGFdKgD0AOlDHgvHi0G7gtLv2IBl5kNnVlcGeY snMw== X-Received: by 10.68.222.233 with SMTP id qp9mr14292642pbc.63.1371856640825; Fri, 21 Jun 2013 16:17:20 -0700 (PDT) X-Received: by 10.68.222.233 with SMTP id qp9mr14292632pbc.63.1371856640764; Fri, 21 Jun 2013 16:17:20 -0700 (PDT) Received: from ubuntu.localdomain ([208.91.1.14]) by mx.google.com with ESMTPSA id ib9sm6569434pbc.43.2013.06.21.16.17.18 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Jun 2013 16:17:19 -0700 (PDT) From: Jesse Gross To: David Miller Cc: netdev@vger.kernel.org, dev@openvswitch.org, Pravin Shelar , Randy Dunlap , Jesse Gross Subject: [PATCH net-next 2/2] ip_tunnel: Protect tunnel functions with CONFIG_INET guard. Date: Fri, 21 Jun 2013 16:17:11 -0700 Message-Id: <1371856631-47807-2-git-send-email-jesse@nicira.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1371856631-47807-1-git-send-email-jesse@nicira.com> References: <1371856631-47807-1-git-send-email-jesse@nicira.com> X-Gm-Message-State: ALoCoQn0quhoGo8uUTT+bEQboyedQHFyh07ipohLJkUXz2B32E8Dx03+FPt/RAfuBAvjnFUPuoa6GCJYJpnH6a5k6bSC6pvyr1+Uvx4A58ljJEDPcOB3h/9Bf+XouROxqDUu0/SC9n/YpYWF2xXgseh4SJ+rWiUcN+E8ezYyTKzOIXC25CLS7kQ= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Tunnel constants can be used in generic code but in these cases the inline functions in ip_tunnels.h cause compilation problems if CONFIG_INET is not set. CC: Pravin Shelar Reported-by: Randy Dunlap Signed-off-by: Jesse Gross Acked-by: Randy Dunlap --- include/net/ip_tunnels.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h index 10bbb42..b0d9824 100644 --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h @@ -93,6 +93,8 @@ struct ip_tunnel_net { struct net_device *fb_tunnel_dev; }; +#ifdef CONFIG_INET + int ip_tunnel_init(struct net_device *dev); void ip_tunnel_uninit(struct net_device *dev); void ip_tunnel_dellink(struct net_device *dev, struct list_head *head); @@ -180,4 +182,7 @@ static inline void iptunnel_xmit_stats(int err, err_stats->tx_dropped++; } } + +#endif /* CONFIG_INET */ + #endif /* __NET_IP_TUNNELS_H */