diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2015-10-05 17:25:54 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-10-05 17:27:06 +0200 |
| commit | 2b5b1a01a77f0e24b77680fce5245a582cb96330 (patch) | |
| tree | 2abf19a04f75ed31a8b0fc54b0d6a8ed22385ee9 /net/netfilter | |
| parent | netfilter: rename nfnetlink_queue_core.c to nfnetlink_queue.c (diff) | |
| parent | ipvs: Don't protect ip_vs_addr_is_unicast with CONFIG_SYSCTL (diff) | |
| download | linux-dev-2b5b1a01a77f0e24b77680fce5245a582cb96330.tar.xz linux-dev-2b5b1a01a77f0e24b77680fce5245a582cb96330.zip | |
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: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c index 37dd77a3d0fb..d08df435c2aa 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c @@ -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. |