Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb7f6a7b authored Sep 19, 2008 by Julius Volz Committed by Simon Horman Oct 07, 2008

IPVS: Move IPVS to net/netfilter/ipvs



Since IPVS now has partial IPv6 support, this patch moves IPVS from
net/ipv4/ipvs to net/netfilter/ipvs. It's a result of:

$ git mv net/ipv4/ipvs net/netfilter

and adapting the relevant Kconfigs/Makefiles to the new path.

Signed-off-by: Julius Volz <juliusv@google.com>
Signed-off-by: Simon Horman <horms@verge.net.au>

parent 8d5803bf

net/ipv4/Kconfig

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -630,5 +630,3 @@ config TCP_MD5SIG

	If unsure, say N.		If unsure, say N.

	source "net/ipv4/ipvs/Kconfig"

net/ipv4/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,6 @@ obj-$(CONFIG_INET_XFRM_MODE_TRANSPORT) += xfrm4_mode_transport.o
	obj-$(CONFIG_INET_XFRM_MODE_TUNNEL) += xfrm4_mode_tunnel.o		obj-$(CONFIG_INET_XFRM_MODE_TUNNEL) += xfrm4_mode_tunnel.o
	obj-$(CONFIG_IP_PNP) += ipconfig.o		obj-$(CONFIG_IP_PNP) += ipconfig.o
	obj-$(CONFIG_NETFILTER) += netfilter.o netfilter/		obj-$(CONFIG_NETFILTER) += netfilter.o netfilter/
	obj-$(CONFIG_IP_VS) += ipvs/
	obj-$(CONFIG_INET_DIAG) += inet_diag.o		obj-$(CONFIG_INET_DIAG) += inet_diag.o
	obj-$(CONFIG_INET_TCP_DIAG) += tcp_diag.o		obj-$(CONFIG_INET_TCP_DIAG) += tcp_diag.o
	obj-$(CONFIG_NET_TCPPROBE) += tcp_probe.o		obj-$(CONFIG_NET_TCPPROBE) += tcp_probe.o

net/netfilter/Kconfig

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -838,3 +838,5 @@ config NETFILTER_XT_MATCH_HASHLIMIT

	endmenu		endmenu

			source "net/netfilter/ipvs/Kconfig"

net/netfilter/Makefile

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -83,3 +83,6 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
	obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o		obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
	obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o		obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o
	obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o		obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o

			# IPVS
			obj-$(CONFIG_IP_VS) += ipvs/

net/ipv4/ipvs/Kconfig→net/netfilter/ipvs/Kconfig

+0 −0

File moved.