| Message ID | 1428002227-11636-4-git-send-email-linville@tuxdriver.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Apr 2, 2015 at 12:17 PM, John W. Linville <linville@tuxdriver.com> wrote: > net/ipv4/geneve.c -> net/ipv4/libgeneve.c > > This name better reflects the purpose of the module. There are several files under net/ipv4/ used as a library, there is no reason to just highlight this single one. So this change is not necessary at all. -- 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
On Thu, Apr 02, 2015 at 05:05:26PM -0700, Cong Wang wrote: > On Thu, Apr 2, 2015 at 12:17 PM, John W. Linville > <linville@tuxdriver.com> wrote: > > net/ipv4/geneve.c -> net/ipv4/libgeneve.c > > > > This name better reflects the purpose of the module. > > There are several files under net/ipv4/ used as a library, > there is no reason to just highlight this single one. So > this change is not necessary at all. If you really want to bikeshed this, than the necessity of the name change depends upon your perspective... The thing is that I want the netdev module to be named "geneve.ko". This mirrors the naming convention used by the vxlan module, and it just makes sense to me. Having two modules with the same name seems to confuse modprobe and company such that module autoloading stops working correctly. The details escape me, but feel free to apply this series without this one patch and try it for yourself. The net effect is that either this name has to change, or I need a different name (geneve-netdev.ko?) for the netdev module. A third option might be to combine this module with the netdev code, but I kinda like the structure of keeping this shared code in its own module. Do you object to the name itself? Or to having a file with a name like that under the net/ipv4 directory? Would you find genevelib.c any less objectionable than libgeneve.c? Can you suggest a better place to keep the shared geneve code? Or a name change that you like better? Honestly, this name change seems like the simplest and least awkward choice to me. But, I am open to suggestions... John
Le 03/04/2015 16:40, John W. Linville a écrit : [snip] > Honestly, this name change seems like the simplest and least awkward > choice to me. But, I am open to suggestions... There is already some files named '_core.c' under net/ipv4 and net/ipv6. What about geneve_core.c ? My two cents, Nicolas -- 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
On Fri, Apr 03, 2015 at 05:54:02PM +0200, Nicolas Dichtel wrote: > Le 03/04/2015 16:40, John W. Linville a écrit : > [snip] > >Honestly, this name change seems like the simplest and least awkward > >choice to me. But, I am open to suggestions... > There is already some files named '_core.c' under net/ipv4 and net/ipv6. > What about geneve_core.c ? Works for me...
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index bd2901604842..0fbf9f0428cd 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 LIBGENEVE + 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..b16e91ecb0c6 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_LIBGENEVE) += libgeneve.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/libgeneve.c similarity index 100% rename from net/ipv4/geneve.c rename to net/ipv4/libgeneve.c diff --git a/net/openvswitch/Kconfig b/net/openvswitch/Kconfig index ed6b0f8dd1bb..8e20a4b8f6fa 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 LIBGENEVE default OPENVSWITCH ---help--- If you say Y here, then the Open vSwitch will be able create geneve vport.
net/ipv4/geneve.c -> net/ipv4/libgeneve.c This name better reflects the purpose of the module. Signed-off-by: John W. Linville <linville@tuxdriver.com> --- net/ipv4/Kconfig | 4 ++-- net/ipv4/Makefile | 2 +- net/ipv4/{geneve.c => libgeneve.c} | 0 net/openvswitch/Kconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename net/ipv4/{geneve.c => libgeneve.c} (100%)