Commit b59f2e31b8abda3d63c53ea7672a219639ded61b

Authored by Eric W. Biederman
Committed by Simon Horman
1 parent 4bf1b54f9d

ipvs: Don't protect ip_vs_addr_is_unicast with CONFIG_SYSCTL

I arranged the code so that the compiler can remove the unecessary bits
in ip_vs_leave when CONFIG_SYSCTL is unset, and removed an explicit
CONFIG_SYSCTL.

Unfortunately when rebasing my work on top of that of Alex Gartrell I
missed the fact that the newly added function ip_vs_addr_is_unicast was
surrounded by CONFIG_SYSCTL.

So remove the now unnecessary CONFIG_SYSCTL guards around
ip_vs_addr_is_unicast.  It is causing build failures today when
CONFIG_SYSCTL is not selected and any self respecting compiler will
notice that sysctl_cache_bypass is always false without CONFIG_SYSCTL
and not include the logic from the function ip_vs_addr_is_unicast in
the compiled code.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

Showing 1 changed file with 0 additions and 2 deletions Side-by-side Diff

net/netfilter/ipvs/ip_vs_core.c
... ... @@ -547,7 +547,6 @@
547 547 return cp;
548 548 }
549 549  
550   -#ifdef CONFIG_SYSCTL
551 550 static inline int ip_vs_addr_is_unicast(struct net *net, int af,
552 551 union nf_inet_addr *addr)
553 552 {
... ... @@ -557,7 +556,6 @@
557 556 #endif
558 557 return (inet_addr_type(net, addr->ip) == RTN_UNICAST);
559 558 }
560   -#endif
561 559  
562 560 /*
563 561 * Pass or drop the packet.