From patchwork Fri Jun 28 18:30:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pravin B Shelar X-Patchwork-Id: 255509 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 E3B752C0090 for ; Sat, 29 Jun 2013 04:30:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751969Ab3F1Sac (ORCPT ); Fri, 28 Jun 2013 14:30:32 -0400 Received: from na3sys009aog110.obsmtp.com ([74.125.149.203]:35942 "HELO na3sys009aog110.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751815Ab3F1Sab (ORCPT ); Fri, 28 Jun 2013 14:30:31 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]) (using TLSv1) by na3sys009aob110.postini.com ([74.125.148.12]) with SMTP ID DSNKUc3WRlSfxDvvfiU/u/ITsU50JKPAPDcW@postini.com; Fri, 28 Jun 2013 11:30:31 PDT Received: by mail-pd0-f182.google.com with SMTP id r10so1187542pdi.13 for ; Fri, 28 Jun 2013 11:30:30 -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:x-gm-message-state; bh=eQhf25sksT4lDHiPFCVYFqhtcVMaGTmAJI2ZR2dxeB0=; b=aHX2Fzl/r7+LxdQ9Uyxxf9s7r/oqFzsBKdKAz9EoyfYQMzwtSbfCW6Yku/gVjd+0AW HGTSGIuPYM+ruAkE+7ldTyzZey79MG++zhPM35CV7CtJBjc8/1+z1rQz76zBkA+CF4CI 3sQf5Kse9aZIkNhYfgMbmH2rMdf96081+aAzn6UEHM4EeVrMhC0lCpLDGB1v6N36D2hA UVo9c33GKe6E+VOQ+jOr3y6fJeOVJ/CaNZT/9IaHZOc43a9xOXCnGdkDNvWtOLyO6tUm XJ3a+tvrjOTiMXQI05GmaK+XdGFfF+ucTFPgRHlWZyjMhae4/hqvqVKFGawdc0QQMXCy wtag== X-Received: by 10.66.118.104 with SMTP id kl8mr9039519pab.182.1372444230308; Fri, 28 Jun 2013 11:30:30 -0700 (PDT) X-Received: by 10.66.118.104 with SMTP id kl8mr9039508pab.182.1372444230221; Fri, 28 Jun 2013 11:30:30 -0700 (PDT) Received: from localhost ([75.98.92.113]) by mx.google.com with ESMTPSA id kq2sm10085761pab.19.2013.06.28.11.30.28 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Fri, 28 Jun 2013 11:30:29 -0700 (PDT) From: Pravin B Shelar To: netdev@vger.kernel.org, dev@openvswitch.org Cc: rdunlap@infradead.org, Pravin B Shelar , Jesse Gross Subject: [PATCH] openvswitch: Add Kconfig dependency on GRE-DEMUX. Date: Fri, 28 Jun 2013 11:30:22 -0700 Message-Id: <1372444222-29379-1-git-send-email-pshelar@nicira.com> X-Mailer: git-send-email 1.8.2.135.g7b592fa X-Gm-Message-State: ALoCoQl7ilcc55F8sstk0JCHgwY/7snowxNafgAwQi0/IgJmbOyBYJSL5lU9j7FY0dEu6n/m9ZpFjE2PeVy/vOnnbrDPA+Cs/ZYcku4fxlmo9K2+JD4TootoxSzivqNTdfgVbyfVaWg7+3Xi6rYaxSTbl6JmmSdrPxj7ymTFjmOvH3SYru/uMY4= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Openvswitch uses function from NET_IPGRE_DEMUX module. Add Kconfig dependency to fix compilation errors. CC: Jesse Gross Reported-by: Randy Dunlap Signed-off-by: Pravin Shelar --- net/openvswitch/Kconfig | 1 + net/openvswitch/vport-gre.c | 2 -- net/openvswitch/vport.c | 3 --- 3 files changed, 1 insertions(+), 5 deletions(-) diff --git a/net/openvswitch/Kconfig b/net/openvswitch/Kconfig index 9fbc04a..9fc0df2 100644 --- a/net/openvswitch/Kconfig +++ b/net/openvswitch/Kconfig @@ -4,6 +4,7 @@ config OPENVSWITCH tristate "Open vSwitch" + depends on NET_IPGRE_DEMUX ---help--- Open vSwitch is a multilayer Ethernet switch targeted at virtualized environments. In addition to supporting a variety of features diff --git a/net/openvswitch/vport-gre.c b/net/openvswitch/vport-gre.c index 943e5c4..21d5073 100644 --- a/net/openvswitch/vport-gre.c +++ b/net/openvswitch/vport-gre.c @@ -16,7 +16,6 @@ * 02110-1301, USA */ -#if IS_ENABLED(CONFIG_NET_IPGRE_DEMUX) #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include @@ -271,4 +270,3 @@ const struct vport_ops ovs_gre_vport_ops = { .get_name = gre_get_name, .send = gre_tnl_send, }; -#endif diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index ba81294..ba240a8 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c @@ -38,10 +38,7 @@ static const struct vport_ops *vport_ops_list[] = { &ovs_netdev_vport_ops, &ovs_internal_vport_ops, - -#if IS_ENABLED(CONFIG_NET_IPGRE_DEMUX) &ovs_gre_vport_ops, -#endif }; /* Protected by RCU read lock for reading, ovs_mutex for writing. */