浏览代码

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>
John W. Linville 10 年之前
父节点
当前提交
11e1fa46b4
共有 4 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      net/ipv4/Kconfig
  2. 1 1
      net/ipv4/Makefile
  3. 0 0
      net/ipv4/geneve_core.c
  4. 1 1
      net/openvswitch/Kconfig

+ 2 - 2
net/ipv4/Kconfig

@@ -331,8 +331,8 @@ config NET_FOU_IP_TUNNELS
 	  When this option is enabled IP tunnels can be configured to use
 	  When this option is enabled IP tunnels can be configured to use
 	  FOU or GUE encapsulation.
 	  FOU or GUE encapsulation.
 
 
-config GENEVE
-	tristate "Generic Network Virtualization Encapsulation (Geneve)"
+config GENEVE_CORE
+	tristate "Generic Network Virtualization Encapsulation library"
 	depends on INET
 	depends on INET
 	select NET_UDP_TUNNEL
 	select NET_UDP_TUNNEL
 	---help---
 	---help---

+ 1 - 1
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_TCP_CONG_ILLINOIS) += tcp_illinois.o
 obj-$(CONFIG_MEMCG_KMEM) += tcp_memcontrol.o
 obj-$(CONFIG_MEMCG_KMEM) += tcp_memcontrol.o
 obj-$(CONFIG_NETLABEL) += cipso_ipv4.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 \
 obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \
 		      xfrm4_output.o xfrm4_protocol.o
 		      xfrm4_output.o xfrm4_protocol.o

+ 0 - 0
net/ipv4/geneve.c → net/ipv4/geneve_core.c


+ 1 - 1
net/openvswitch/Kconfig

@@ -59,7 +59,7 @@ config OPENVSWITCH_VXLAN
 config OPENVSWITCH_GENEVE
 config OPENVSWITCH_GENEVE
 	tristate "Open vSwitch Geneve tunneling support"
 	tristate "Open vSwitch Geneve tunneling support"
 	depends on OPENVSWITCH
 	depends on OPENVSWITCH
-	depends on GENEVE
+	depends on GENEVE_CORE
 	default OPENVSWITCH
 	default OPENVSWITCH
 	---help---
 	---help---
 	  If you say Y here, then the Open vSwitch will be able create geneve vport.
 	  If you say Y here, then the Open vSwitch will be able create geneve vport.