diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2015-05-13 12:57:28 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-05-13 15:59:13 -0400 |
| commit | 11e1fa46b43216458e0f67f1f0b257586c5d8e5c (patch) | |
| tree | cc15b0dd34b05751c3cc3ab48786d8e8ee06174b /net/ipv4 | |
| parent | geneve: move definition of geneve_hdr() to geneve.h (diff) | |
| download | linux-dev-11e1fa46b43216458e0f67f1f0b257586c5d8e5c.tar.xz linux-dev-11e1fa46b43216458e0f67f1f0b257586c5d8e5c.zip | |
geneve: Rename support library as geneve_core
net/ipv4/geneve.c -> net/ipv4/geneve_core.c
This name better reflects the purpose of the module.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/Kconfig | 4 | ||||
| -rw-r--r-- | net/ipv4/Makefile | 2 | ||||
| -rw-r--r-- | net/ipv4/geneve_core.c (renamed from net/ipv4/geneve.c) | 0 |
3 files changed, 3 insertions, 3 deletions
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 index 001843d41135..001843d41135 100644 --- a/net/ipv4/geneve.c +++ b/net/ipv4/geneve_core.c |