Commit 2b5b1a01 authored Oct 05, 2015 by Pablo Neira Ayuso

ipvs-next



Simon Horman says:

====================
Third Round of IPVS Updates for v4.4

please consider this build fix from Eric Biederman which resolves
a build problem introduced in is excellent work to cleanup IPVS which
you recently pulled: its queued up for v4.4 so no need to worry
about earlier kernel versions.

I have another minor cleanup, to fix a build warning, pending.
However, I wanted to send this one to you now as its hit nf-next,
net-next and in turn next, and a slow trickle of bug reports are appearing.
====================

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parents 32f40c5f b59f2e31

net/netfilter/ipvs/ip_vs_core.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -547,7 +547,6 @@ ip_vs_schedule(struct ip_vs_service svc, struct sk_buff skb,
		return cp;
		}

		#ifdef CONFIG_SYSCTL
		static inline int ip_vs_addr_is_unicast(struct net *net, int af,
		union nf_inet_addr *addr)
		{
		@@ -557,7 +556,6 @@ static inline int ip_vs_addr_is_unicast(struct net *net, int af,
		#endif
		return (inet_addr_type(net, addr->ip) == RTN_UNICAST);
		}
		#endif

		/*
		* Pass or drop the packet.