From patchwork Fri May 8 17:20:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "John W. Linville" X-Patchwork-Id: 470113 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 C275B140281 for ; Sat, 9 May 2015 03:22:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932493AbbEHRWR (ORCPT ); Fri, 8 May 2015 13:22:17 -0400 Received: from charlotte.tuxdriver.com ([70.61.120.58]:49264 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932480AbbEHRWL (ORCPT ); Fri, 8 May 2015 13:22:11 -0400 Received: from uucp by smtp.tuxdriver.com with local-rmail (Exim 4.63) (envelope-from ) id 1YqlyL-0004nZ-ES; Fri, 08 May 2015 13:22:01 -0400 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by localhost.localdomain (8.14.9/8.14.6) with ESMTP id t48HLirU000790; Fri, 8 May 2015 13:21:44 -0400 Received: (from linville@localhost) by localhost.localdomain (8.14.9/8.14.9/Submit) id t48HLifs000789; Fri, 8 May 2015 13:21:44 -0400 From: "John W. Linville" To: netdev@vger.kernel.org Cc: "David S. Miller" , Jesse Gross , Andy Zhou , Stephen Hemminger , Alexander Duyck , "John W. Linville" Subject: [PATCH 3/5] geneve: Rename support library as geneve_core Date: Fri, 8 May 2015 13:20:55 -0400 Message-Id: <1431105657-25492-4-git-send-email-linville@tuxdriver.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431105657-25492-1-git-send-email-linville@tuxdriver.com> References: <1431105657-25492-1-git-send-email-linville@tuxdriver.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org net/ipv4/geneve.c -> net/ipv4/geneve_core.c This name better reflects the purpose of the module. Signed-off-by: John W. Linville --- Also, it prevents name resolution issues with module loading for the geneve netdev coming later in this series... net/ipv4/Kconfig | 4 ++-- net/ipv4/Makefile | 2 +- net/ipv4/{geneve.c => geneve_core.c} | 0 net/openvswitch/Kconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename net/ipv4/{geneve.c => geneve_core.c} (100%) diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index bd2901604842..d83071dccd74 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -331,8 +331,8 @@ config NET_FOU_IP_TUNNELS When this option is enabled IP tunnels can be configured to use FOU or GUE encapsulation. -config GENEVE - tristate "Generic Network Virtualization Encapsulation (Geneve)" +config GENEVE_CORE + tristate "Generic Network Virtualization Encapsulation library" depends on INET select NET_UDP_TUNNEL ---help--- diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile index 518c04ed666e..b36236dd6014 100644 --- a/net/ipv4/Makefile +++ b/net/ipv4/Makefile @@ -56,7 +56,7 @@ obj-$(CONFIG_TCP_CONG_YEAH) += tcp_yeah.o obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o obj-$(CONFIG_MEMCG_KMEM) += tcp_memcontrol.o obj-$(CONFIG_NETLABEL) += cipso_ipv4.o -obj-$(CONFIG_GENEVE) += geneve.o +obj-$(CONFIG_GENEVE_CORE) += geneve_core.o obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \ xfrm4_output.o xfrm4_protocol.o diff --git a/net/ipv4/geneve.c b/net/ipv4/geneve_core.c similarity index 100% rename from net/ipv4/geneve.c rename to net/ipv4/geneve_core.c diff --git a/net/openvswitch/Kconfig b/net/openvswitch/Kconfig index ed6b0f8dd1bb..15840401a2ce 100644 --- a/net/openvswitch/Kconfig +++ b/net/openvswitch/Kconfig @@ -59,7 +59,7 @@ config OPENVSWITCH_VXLAN config OPENVSWITCH_GENEVE tristate "Open vSwitch Geneve tunneling support" depends on OPENVSWITCH - depends on GENEVE + depends on GENEVE_CORE default OPENVSWITCH ---help--- If you say Y here, then the Open vSwitch will be able create geneve vport.