Commit 2b5b1a01 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso

Merge tag 'ipvs3-for-v4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/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: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parents 32f40c5f b59f2e31
...@@ -547,7 +547,6 @@ ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff *skb, ...@@ -547,7 +547,6 @@ ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff *skb,
return cp; return cp;
} }
#ifdef CONFIG_SYSCTL
static inline int ip_vs_addr_is_unicast(struct net *net, int af, static inline int ip_vs_addr_is_unicast(struct net *net, int af,
union nf_inet_addr *addr) union nf_inet_addr *addr)
{ {
...@@ -557,7 +556,6 @@ static inline int ip_vs_addr_is_unicast(struct net *net, int af, ...@@ -557,7 +556,6 @@ static inline int ip_vs_addr_is_unicast(struct net *net, int af,
#endif #endif
return (inet_addr_type(net, addr->ip) == RTN_UNICAST); return (inet_addr_type(net, addr->ip) == RTN_UNICAST);
} }
#endif
/* /*
* Pass or drop the packet. * Pass or drop the packet.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment